diff --git a/ruby/gilded_rose.rb b/ruby/gilded_rose.rb
index e177a497..26c21e68 100644
--- a/ruby/gilded_rose.rb
+++ b/ruby/gilded_rose.rb
@@ -1,3 +1,4 @@
+require 'byebug'
 class GildedRose
 
   def initialize(items)
@@ -6,63 +7,34 @@ class GildedRose
 
   def update_quality()
     @items.each do |item|
-      if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert"
-        if item.quality > 0
-          if item.name != "Sulfuras, Hand of Ragnaros"
-            item.quality = item.quality - 1
-          end
+
+      # Decreasing the quality of item
+      if !item.is_aged_brie? && !item.is_backstage_passes? && !item.is_sulfuras? && item.quality > 0
+        if item.sell_in < 0
+          item.quality = item.quality - 4 if item.is_conjured_mana_cake?
+          item.quality = item.quality - 2 if !item.is_conjured_mana_cake?
+        else
+          item.quality = item.quality - 2 if item.is_conjured_mana_cake?
+          item.quality = item.quality - 1 if !item.is_conjured_mana_cake?
         end
-      else
-        if item.quality < 50
+      elsif item.quality < 50 && (item.is_backstage_passes? || item.is_aged_brie?)
+        if item.sell_in < 11
+          item.quality = item.quality + 2
+        elsif item.sell_in < 6
+          item.quality = item.quality + 3
+        else 
           item.quality = item.quality + 1
-          if item.name == "Backstage passes to a TAFKAL80ETC concert"
-            if item.sell_in < 11
-              if item.quality < 50
-                item.quality = item.quality + 1
-              end
-            end
-            if item.sell_in < 6
-              if item.quality < 50
-                item.quality = item.quality + 1
-              end
-            end
-          end
         end
+        item.quality = 50 if item.quality > 50
       end
-      if item.name != "Sulfuras, Hand of Ragnaros"
+
+      if !item.is_sulfuras?
         item.sell_in = item.sell_in - 1
       end
+
       if item.sell_in < 0
-        if item.name != "Aged Brie"
-          if item.name != "Backstage passes to a TAFKAL80ETC concert"
-            if item.quality > 0
-              if item.name != "Sulfuras, Hand of Ragnaros"
-                item.quality = item.quality - 1
-              end
-            end
-          else
-            item.quality = item.quality - item.quality
-          end
-        else
-          if item.quality < 50
-            item.quality = item.quality + 1
-          end
-        end
+        item.quality = item.quality - item.quality if item.is_aged_brie? || item.is_backstage_passes?
       end
     end
   end
 end
-
-class Item
-  attr_accessor :name, :sell_in, :quality
-
-  def initialize(name, sell_in, quality)
-    @name = name
-    @sell_in = sell_in
-    @quality = quality
-  end
-
-  def to_s()
-    "#{@name}, #{@sell_in}, #{@quality}"
-  end
-end
diff --git a/ruby/gilded_rose_spec.rb b/ruby/gilded_rose_spec.rb
index 269fe1b0..4978f83d 100644
--- a/ruby/gilded_rose_spec.rb
+++ b/ruby/gilded_rose_spec.rb
@@ -1,5 +1,6 @@
+require "rspec"
 require File.join(File.dirname(__FILE__), 'gilded_rose')
-
+require File.join(File.dirname(__FILE__), 'item')
 describe GildedRose do
 
   describe "#update_quality" do
diff --git a/ruby/gilded_rose_tests.rb b/ruby/gilded_rose_tests.rb
index 2e1b70d1..7ebd59c2 100644
--- a/ruby/gilded_rose_tests.rb
+++ b/ruby/gilded_rose_tests.rb
@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'gilded_rose')
+require File.join(File.dirname(__FILE__), 'item')
 require 'test/unit'
 
 class TestUntitled < Test::Unit::TestCase
diff --git a/ruby/item.rb b/ruby/item.rb
new file mode 100644
index 00000000..0feeca05
--- /dev/null
+++ b/ruby/item.rb
@@ -0,0 +1,29 @@
+class Item
+  attr_accessor :name, :sell_in, :quality
+
+  def initialize(name, sell_in, quality)
+    @name = name
+    @sell_in = sell_in
+    @quality = quality
+  end
+
+  def to_s()
+    "#{@name}, #{@sell_in}, #{@quality}"
+  end
+
+  def is_aged_brie?
+    name == "Aged Brie"
+  end
+
+  def is_backstage_passes?
+    name == "Backstage passes to a TAFKAL80ETC concert"
+  end
+
+  def is_sulfuras?
+    name == "Sulfuras, Hand of Ragnaros"
+  end
+
+  def is_conjured_mana_cake?
+    name == "Conjured Mana Cake"
+  end
+end
diff --git a/ruby/texttest_fixture.rb b/ruby/texttest_fixture.rb
index ad76aacf..614f059d 100644
--- a/ruby/texttest_fixture.rb
+++ b/ruby/texttest_fixture.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/ruby -w
 
 require File.join(File.dirname(__FILE__), 'gilded_rose')
+require File.join(File.dirname(__FILE__), 'item')
 
 puts "OMGHAI!"
 items = [