diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index 1d113c5a..cb5d3e3b 100644
--- a/Java/src/main/java/com/gildedrose/GildedRose.java
+++ b/Java/src/main/java/com/gildedrose/GildedRose.java
@@ -17,34 +17,33 @@ class GildedRose {
 		if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
 			return;
 		}
-		if (item.name.equals("Aged Brie")) {
-			increaseQuality(item);
-		} else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
-			increaseQuality(item);
-			if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
-				if (item.sellIn < 11) {
-					increaseQuality(item);
-				}
-
-				if (item.sellIn < 6) {
-					increaseQuality(item);
-				}
-			}
-		} else {
-			decreaseQuality(item);
-		}
 
 		item.sellIn = item.sellIn - 1;
 
-		if (item.sellIn < 0) {
-			if (item.name.equals("Aged Brie")) {
+		if (item.name.equals("Aged Brie")) {
+			increaseQuality(item);
+			if (item.sellIn < 0) {
 				increaseQuality(item);
-			} else {
-				if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
-					item.quality = item.quality - item.quality;
-				} else {
-					decreaseQuality(item);
-				}
+			}
+		} else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
+			increaseQuality(item);
+
+			if (item.sellIn < 10) {
+				increaseQuality(item);
+			}
+
+			if (item.sellIn < 5) {
+				increaseQuality(item);
+			}
+
+			if (item.sellIn < 0) {
+				item.quality = item.quality - item.quality;
+			}
+
+		} else {
+			decreaseQuality(item);
+			if (item.sellIn < 0) {
+				decreaseQuality(item);
 			}
 		}
 	}