diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs
index 00263f0f..88c62f48 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs	
@@ -14,37 +14,34 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public abstract class EssentialsDevice : Device
     {
-        public EssentialsDevice(string key)
+        protected EssentialsDevice(string key)
             : base(key)
         {
 
         }
+    }
 
-        public abstract class Factory : IDeviceFactory
+    public abstract class Factory : IDeviceFactory
+    {
+        #region IDeviceFactory Members
+
+        public List<string> TypeNames { get; protected set; }
+
+        public virtual void LoadTypeFactories()
         {
-            #region IDeviceFactory Members
-
-            public List<string> TypeNames { get; protected set; }
-
-            public virtual void LoadTypeFactories()
+            foreach (var typeName in TypeNames)
             {
-                foreach (var typeName in TypeNames)
-                {
-                    DeviceFactory.AddFactoryForType(typeName, BuildDevice);
-                }
+                DeviceFactory.AddFactoryForType(typeName, BuildDevice);
             }
-
-            #endregion
-
-            public abstract IKeyed BuildDevice(DeviceConfig dc);
-
-            public Factory()
-            {
-                TypeNames = new List<string>();
-            }
-
         }
-        
 
+        #endregion
+
+        public abstract IKeyed BuildDevice(DeviceConfig dc);
+
+        protected Factory()
+        {
+            TypeNames = new List<string>();
+        }
     }
 }
\ No newline at end of file