diff --git a/js-jest/src/gilded_rose.js b/js-jest/src/gilded_rose.js
index 36821b1a..6e70aba5 100644
--- a/js-jest/src/gilded_rose.js
+++ b/js-jest/src/gilded_rose.js
@@ -22,44 +22,51 @@ class Shop {
     for (let i = 0; i < this.items.length; i++) {
       if (this.items[i].name === "Sulfuras, Hand of Ragnaros") continue;
 
-      if (
-        this.items[i].name === "Aged Brie" ||
-        this.items[i].name === "Backstage passes to a TAFKAL80ETC concert"
-      ) {
-        if (this.items[i].quality < 50) {
-          this.items[i].quality = this.items[i].quality + 1;
-          if (
-            this.items[i].name == "Backstage passes to a TAFKAL80ETC concert"
-          ) {
-            if (this.items[i].sellIn < 11 && this.items[i].quality < 50) {
-              this.items[i].quality = this.items[i].quality + 1;
-            }
-            if (this.items[i].sellIn < 6 && this.items[i].quality < 50) {
-              this.items[i].quality = this.items[i].quality + 1;
-            }
-          }
-        }
-      } else if (this.items[i].quality > 0) {
-        this.items[i].quality = this.items[i].quality - 1;
-      }
-
       this.items[i].sellIn = this.items[i].sellIn - 1;
 
-      if (this.items[i].sellIn < 0) {
-        if (this.items[i].name != "Aged Brie") {
-          if (
-            this.items[i].name != "Backstage passes to a TAFKAL80ETC concert"
-          ) {
-            if (this.items[i].quality > 0) {
-              this.items[i].quality = this.items[i].quality - 1;
-            }
-          } else {
-            this.items[i].quality =
-              this.items[i].quality - this.items[i].quality;
-          }
-        } else if (this.items[i].quality < 50) {
+      if (this.items[i].name === "Aged Brie") {
+        if (this.items[i].quality < 50) {
           this.items[i].quality = this.items[i].quality + 1;
         }
+
+        if (this.items[i].sellIn < 0) {
+          if (this.items[i].quality < 50) {
+            this.items[i].quality = this.items[i].quality + 1;
+          }
+        }
+
+        continue;
+      }
+
+      if (this.items[i].name === "Backstage passes to a TAFKAL80ETC concert") {
+        if (this.items[i].quality < 50) {
+          this.items[i].quality = this.items[i].quality + 1;
+
+          if (this.items[i].sellIn < 10 && this.items[i].quality < 50) {
+            this.items[i].quality = this.items[i].quality + 1;
+          }
+          if (this.items[i].sellIn < 5 && this.items[i].quality < 50) {
+            this.items[i].quality = this.items[i].quality + 1;
+          }
+        }
+
+        if (this.items[i].sellIn < 0) {
+          this.items[i].quality = this.items[i].quality - this.items[i].quality;
+        }
+
+        continue;
+      }
+
+      if (this.items[i].quality > 0) {
+        this.items[i].quality = this.items[i].quality - 1;
+
+        if (this.items[i].sellIn < 0) {
+          if (this.items[i].quality > 0) {
+            this.items[i].quality = this.items[i].quality - 1;
+          }
+        }
+
+        continue;
       }
     }