diff --git a/csharp/StrategyPatternExample/CategoryStrategiesFactory.cs b/csharp/StrategyPatternExample/CategoryStrategiesFactory.cs
index 45dac99a..d917511d 100644
--- a/csharp/StrategyPatternExample/CategoryStrategiesFactory.cs
+++ b/csharp/StrategyPatternExample/CategoryStrategiesFactory.cs
@@ -7,49 +7,19 @@ namespace csharp.StrategyPatternExample
     /// <summary>
     /// This class is responsible for providing a category strategy to a given item.
     /// </summary>
-    internal class CategoryStrategiesFactory
+    static internal class CategoryStrategiesFactory
     {
-        #region Variables
-
-        static private CategoryStrategiesFactory _strategiesFactory = null;
-
-        #endregion
-
-        #region Constructor
-
-        private CategoryStrategiesFactory() { }
-
-        #endregion
-
         #region Methods
 
-        public static CategoryStrategiesFactory GetInstance()
+        static public ICategoryStrategy GetCategoryStrategies(Item item)
         {
-            if (_strategiesFactory == null)
+            switch (item.Name)
             {
-                _strategiesFactory = new CategoryStrategiesFactory();
-            }
+                case Global.NAME_ITEM_AGED_BRIE:
+                    return new OlderIsBetterStrategy();
 
-            return _strategiesFactory;
-        }
-        
-        public List<ICategoryStrategy> GetCategoryStrategies(Item item)
-        {
-            List<ICategoryStrategy> listCategoryStrategies = new List<ICategoryStrategy>();
-
-            if (item.Name == Global.NAME_ITEM_AGED_BRIE)
-            {
-                listCategoryStrategies = new List<ICategoryStrategy>()
-                {
-                    new OlderIsBetterStrategy()
-                };
-
-            }
-            else if (item.Name == Global.NAME_ITEM_BACKSTAGE_PASSES)
-            {
-                listCategoryStrategies = new List<ICategoryStrategy>()
-                {
-                    new CloseExpiredImproveQualityStrategy(new List<CloseExpiredImproveQualityStrategy.NextExpiredCondition>() {
+                case Global.NAME_ITEM_BACKSTAGE_PASSES:
+                    return new CloseExpiredImproveQualityStrategy(new List<CloseExpiredImproveQualityStrategy.NextExpiredCondition>() {
                         new CloseExpiredImproveQualityStrategy.NextExpiredCondition()
                         {
                             SellInLimit = 5,
@@ -60,31 +30,17 @@ namespace csharp.StrategyPatternExample
                             SellInLimit = 10,
                             Increment = 2
                         }
-                    })
-                };
-            }
-            else if (item.Name == Global.NAME_ITEM_SULFURAS)
-            {
-                listCategoryStrategies = new List<ICategoryStrategy>()
-                {
-                };
-            }
-            else if (item.Name == Global.NAME_ITEM_CONJURED)
-            {
-                listCategoryStrategies = new List<ICategoryStrategy>()
-                {
-                    new TwiceFastDegradeQualityStrategy()
-                };
-            }
-            else
-            {
-                listCategoryStrategies = new List<ICategoryStrategy>()
-                {
-                    new NormalDegradeStrategy()
-                };
-            }
+                    });
 
-            return listCategoryStrategies;
+                case Global.NAME_ITEM_SULFURAS:
+                    return new DoNothingStrategy();
+
+                case Global.NAME_ITEM_CONJURED:
+                    return new TwiceFastDegradeQualityStrategy();
+
+                default:
+                    return new NormalDegradeStrategy();
+            }
         }
         
         #endregion
diff --git a/csharp/StrategyPatternExample/ItemWrapperContext.cs b/csharp/StrategyPatternExample/ItemWrapperContext.cs
index 441e82db..08322a7b 100644
--- a/csharp/StrategyPatternExample/ItemWrapperContext.cs
+++ b/csharp/StrategyPatternExample/ItemWrapperContext.cs
@@ -11,7 +11,7 @@ namespace csharp.StrategyPatternExample
         #region Variables
                         
         private Item _item;
-        private List<ICategoryStrategy> listCategoryStrategies;
+        private ICategoryStrategy strategy;
 
         #endregion
 
@@ -42,8 +42,7 @@ namespace csharp.StrategyPatternExample
         public ItemWrapperContext(Item item)
         {
             this._item = item;
-
-            listCategoryStrategies = CategoryStrategiesFactory.GetInstance().GetCategoryStrategies(item);
+            this.strategy = CategoryStrategiesFactory.GetCategoryStrategies(item);
         }
 
         #endregion
@@ -52,10 +51,7 @@ namespace csharp.StrategyPatternExample
 
         public void UpdateQuality()
         {
-            foreach (ICategoryStrategy categoryStrategyItem in this.listCategoryStrategies)
-            {
-                categoryStrategyItem.Update(this._item);
-            }
+            strategy.Update(this._item);
         }
 
         #endregion