diff --git a/Java/src/main/java/com/gildedrose/item_helpers/ItemHandler.java b/Java/src/main/java/com/gildedrose/item_helpers/ItemHandler.java
index 8ecd8eb6..d1b8efb0 100644
--- a/Java/src/main/java/com/gildedrose/item_helpers/ItemHandler.java
+++ b/Java/src/main/java/com/gildedrose/item_helpers/ItemHandler.java
@@ -12,14 +12,6 @@ public class ItemHandler {
         this.item = item;
     }
 
-    public boolean qualityIsHigherThanZero() {
-        return item.quality > 0;
-    }
-
-    public void makeQualityZero() {
-        item.quality = 0;
-    }
-
     public void decrementSellInDate() {
         item.sellIn--;
     }
@@ -28,20 +20,24 @@ public class ItemHandler {
         return item.sellIn >= 0;
     }
 
-    public boolean sellInLessThan5Days() {
+    public boolean lessThan5DaysToSellIn() {
         return item.sellIn >= 0 && item.sellIn <= 5;
     }
 
-    public boolean sellInLessThan10Days() {
+    public boolean lessThan10DaysToSellIn() {
         return item.sellIn >= 5 && item.sellIn <= 10;
     }
 
-    public boolean sellInMoreThan10Days() {
+    public boolean moreThan10DaysToSellIn() {
         return item.sellIn >= 10;
     }
 
+    public void makeQualityZero() {
+        item.quality = 0;
+    }
+
     public void incrementQuality() {
-        item.quality++;
+        item.quality = max(item.quality + 1, 0);
     }
 
     public void incrementQualityBy2() {
@@ -53,7 +49,7 @@ public class ItemHandler {
     }
 
     public void decrementQuality() {
-        item.quality--;
+        item.quality = max(item.quality - 1, 0);
     }
 
     public void decrementQualityBy2() {
diff --git a/Java/src/main/java/com/gildedrose/items/BackstagePassItem.java b/Java/src/main/java/com/gildedrose/items/BackstagePassItem.java
index b3617199..afe2d82e 100644
--- a/Java/src/main/java/com/gildedrose/items/BackstagePassItem.java
+++ b/Java/src/main/java/com/gildedrose/items/BackstagePassItem.java
@@ -1,8 +1,8 @@
 package com.gildedrose.items;
 
-import com.gildedrose.main.Item;
 import com.gildedrose.item_helpers.ItemHandler;
 import com.gildedrose.item_helpers.ItemType;
+import com.gildedrose.main.Item;
 
 public class BackstagePassItem implements ItemType {
 
@@ -15,11 +15,11 @@ public class BackstagePassItem implements ItemType {
     @Override
     public void updateQuality() {
         item.decrementSellInDate();
-        if (item.sellInMoreThan10Days()) {
+        if (item.moreThan10DaysToSellIn()) {
             item.incrementQuality();
-        } else if (item.sellInLessThan10Days()) {
+        } else if (item.lessThan10DaysToSellIn()) {
             item.incrementQualityBy2();
-        } else if (item.sellInLessThan5Days()) {
+        } else if (item.lessThan5DaysToSellIn()) {
             item.incrementQualityBy3();
         } else {
             item.makeQualityZero();
diff --git a/Java/src/main/java/com/gildedrose/items/ConjuredItem.java b/Java/src/main/java/com/gildedrose/items/ConjuredItem.java
index 41ec0fb9..c2d5f450 100644
--- a/Java/src/main/java/com/gildedrose/items/ConjuredItem.java
+++ b/Java/src/main/java/com/gildedrose/items/ConjuredItem.java
@@ -1,8 +1,8 @@
 package com.gildedrose.items;
 
-import com.gildedrose.main.Item;
 import com.gildedrose.item_helpers.ItemHandler;
 import com.gildedrose.item_helpers.ItemType;
+import com.gildedrose.main.Item;
 
 public class ConjuredItem implements ItemType {
 
@@ -15,12 +15,10 @@ public class ConjuredItem implements ItemType {
     @Override
     public void updateQuality() {
         item.decrementSellInDate();
-        if (item.qualityIsHigherThanZero()) {
-            if (item.beforeSellInDate()) {
-                item.decrementQuality();
-            } else {
-                item.decrementQualityBy4();
-            }
+        if (item.beforeSellInDate()) {
+            item.decrementQuality();
+        } else {
+            item.decrementQualityBy4();
         }
     }
 
diff --git a/Java/src/main/java/com/gildedrose/items/NormalItem.java b/Java/src/main/java/com/gildedrose/items/NormalItem.java
index 4adf6aaf..cb4316fc 100644
--- a/Java/src/main/java/com/gildedrose/items/NormalItem.java
+++ b/Java/src/main/java/com/gildedrose/items/NormalItem.java
@@ -1,8 +1,8 @@
 package com.gildedrose.items;
 
-import com.gildedrose.main.Item;
 import com.gildedrose.item_helpers.ItemHandler;
 import com.gildedrose.item_helpers.ItemType;
+import com.gildedrose.main.Item;
 
 public class NormalItem implements ItemType {
 
@@ -15,12 +15,10 @@ public class NormalItem implements ItemType {
     @Override
     public void updateQuality() {
         item.decrementSellInDate();
-        if (item.qualityIsHigherThanZero()) {
-            if (item.beforeSellInDate()) {
-                item.decrementQuality();
-            } else {
-                item.decrementQualityBy2();
-            }
+        if (item.beforeSellInDate()) {
+            item.decrementQuality();
+        } else {
+            item.decrementQualityBy2();
         }
     }