diff --git a/src/Pepperdash Core/Logging/CrestronEnricher.cs b/src/Pepperdash Core/Logging/CrestronEnricher.cs
index 623530e..902ce8d 100644
--- a/src/Pepperdash Core/Logging/CrestronEnricher.cs	
+++ b/src/Pepperdash Core/Logging/CrestronEnricher.cs	
@@ -15,15 +15,14 @@ namespace PepperDash.Core.Logging
 
         static CrestronEnricher()
         {
-            if(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
+            switch (CrestronEnvironment.DevicePlatform)
             {
-                _appName = $"App {InitialParametersClass.ApplicationNumber}";
-                return;
-            }
-
-            if(CrestronEnvironment.DevicePlatform == eDevicePlatform.Server)
-            {
-                _appName = $"Room {InitialParametersClass.RoomId}";
+                case eDevicePlatform.Appliance:
+                    _appName = $"App {InitialParametersClass.ApplicationNumber}";
+                    break;
+                case eDevicePlatform.Server:
+                    _appName = $"{InitialParametersClass.RoomId}";
+                    break;
             }
         }