diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/Components/RoomComponents.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/Components/RoomComponents.cs
index 62c64a7b..f0a69467 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/Components/RoomComponents.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/Components/RoomComponents.cs	
@@ -16,7 +16,7 @@ namespace PepperDash.Essentials.Core.Interfaces.Components
         List<IActivatableComponent> Components { get; }
         List<IRoomActivityComponent> Activities { get; }
 
-        List<T> GetRoomComponentsOfType<T>();
+        List<T> GetComponentsOfType<T>() where T : IActivatableComponent;
         List<IRoomActivityComponent> GetOrderedActvities();
     }
 
@@ -88,6 +88,6 @@ namespace PepperDash.Essentials.Core.Interfaces.Components
     /// </summary>
     public interface IRoomDeviceComponent<T> : IActivatableComponent where T : EssentialsDevice
     {
-        public T Device { get; }
+        T Device { get; }
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/ComponentRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/ComponentRoom.cs
index d8535ee8..42eda1c9 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/ComponentRoom.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/ComponentRoom.cs	
@@ -106,7 +106,7 @@ namespace PepperDash.Essentials.Core.Room
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
-        public List<T> GetRoomComponentsOfType<T>() where T : IActivatableComponent
+        public List<T> GetComponentsOfType<T>() where T : IActivatableComponent
         {
             return Components.OfType<T>().ToList();
         }
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/RoomComponentBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/RoomComponentBase.cs
index 580e6486..19da5ffb 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/RoomComponentBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/RoomComponentBase.cs	
@@ -34,4 +34,6 @@ namespace PepperDash.Essentials.Core.Room.Components
         }
 
     }
+
+
 }
\ No newline at end of file