diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index 57ac255b..5262b87d 100644
--- a/Java/src/main/java/com/gildedrose/GildedRose.java
+++ b/Java/src/main/java/com/gildedrose/GildedRose.java
@@ -10,11 +10,19 @@ class GildedRose {
   public void updateQuality() {
 
     for (Item item : items) {
+      if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
 
-      if (item.name.equals("Aged Brie")) {
+        return;
+      } else if (item.name.equals("Aged Brie")) {
 
         plusOneQuilaty_if_less_than_fifth(item);
+
         item.sellIn = item.sellIn - 1;
+
+        if (item.sellIn < 0) {
+          plusOneQuilaty_if_less_than_fifth(item);
+        }
+
       } else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
 
         if (item.quality < 50) {
@@ -28,22 +36,17 @@ class GildedRose {
             plusOneQuilaty_if_less_than_fifth(item);
           }
         }
-        item.sellIn = item.sellIn - 1;
-      } else if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
 
+        item.sellIn = item.sellIn - 1;
+
+        if (item.sellIn < 0) {
+          item.quality = item.quality - item.quality;
+        }
       } else {
 
         caculateQuilaty_without_Sulfuras(item);
         item.sellIn = item.sellIn - 1;
-      }
-
-
-      if (item.sellIn < 0) {
-        if (item.name.equals("Aged Brie")) {
-          plusOneQuilaty_if_less_than_fifth(item);
-        } else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
-          item.quality = item.quality - item.quality;
-        } else {
+        if (item.sellIn < 0) {
           caculateQuilaty_without_Sulfuras(item);
         }
       }
@@ -59,11 +62,7 @@ class GildedRose {
 
   private void caculateQuilaty_without_Sulfuras(Item item) {
     if (item.quality > 0) {
-      if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
-
-      } else {
-        item.quality = item.quality - 1;
-      }
+      item.quality = item.quality - 1;
     }
   }
 }