diff --git a/esphome/esp-loungesouthleftswitch.yaml b/esphome/esp-loungesouthleftswitch.yaml
index 8764bf3..00ff031 100644
--- a/esphome/esp-loungesouthleftswitch.yaml
+++ b/esphome/esp-loungesouthleftswitch.yaml
@@ -70,7 +70,7 @@ substitutions:
 
   # Project Naming
   project_name: "Zemismart Technologies.KS-811 Double" # Project Details
-  project_version: "v4.1"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
+  project_version: "v4.1" # Project V denotes release of yaml file, allowing checking of deployed vs latest version
 
   # Passwords & Secrets
   api_key: !secret esp-api_key # unfortunately you can't use substitutions inside secrets names
@@ -93,8 +93,8 @@ substitutions:
   mqtt_remote_device_name: "garage-corridor-lights"
   mqtt_remote_command_topic: "${mqtt_command_main_topic}/${mqtt_remote_device_name}"
   mqtt_remote_status_topic: "${mqtt_status_main_topic}/${mqtt_remote_device_name}"
-  mqtt_remote_device_command_ON: "ON"
-  mqtt_remote_device_command_OFF: "OFF"
+  mqtt_remote_device_command_ON: "On"
+  mqtt_remote_device_command_OFF: "Off"
 
   # Switch Naming
   switch_1_name: "Wall Washer Left"
@@ -167,7 +167,7 @@ esp8266:
 # https://esphome.io/components/logger.html
 #:########################################################################################:#
 logger:
-  level: "${log_level}"  #INFO Level suggested, or DEBUG for testing
+  level: "${log_level}" #INFO Level suggested, or DEBUG for testing
   #baud_rate: 0 #set to 0 for no logging via UART, needed if you are using it for other serial things (eg PZEM)
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
@@ -268,18 +268,18 @@ switch:
     on_turn_on:
       - if:
           condition:
-            lambda: 'return !id(relay2_change_origin_remote);'
+            lambda: "return !id(relay2_change_origin_remote);"
           then:
             - mqtt.publish:
                 topic: "${mqtt_remote_command_topic}"
                 payload: "${mqtt_remote_device_command_ON}"
-      - lambda: 'id(relay2_change_origin_remote) = false;'
+      - lambda: "id(relay2_change_origin_remote) = false;"
     on_turn_off:
       - if:
           condition:
-            lambda: 'return !id(relay2_change_origin_remote);'
+            lambda: "return !id(relay2_change_origin_remote);"
           then:
             - mqtt.publish:
                 topic: "${mqtt_remote_command_topic}"
                 payload: "${mqtt_remote_device_command_OFF}"
-      - lambda: 'id(relay2_change_origin_remote) = false;'
\ No newline at end of file
+      - lambda: "id(relay2_change_origin_remote) = false;"