diff --git a/propbox.yaml b/propbox.yaml
index 27e16d4023365d19adaf8c28e2a904e2c550db13..f5fb5ff590a0828a3ce8172fc5a99248a2d40098 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -153,21 +153,17 @@ switch:
     name: "Status: Light"
     optimistic: true
     turn_on_action:
-      - http_request.post:
-          url: http://${hostname_light}/switch/power/turn_on
+      - http_request.post: http://${hostname_light}/switch/power/turn_on
     turn_off_action:
-      - http_request.post:
-          url: http://${hostname_light}/switch/power/turn_off
+      - http_request.post: http://${hostname_light}/switch/power/turn_off
   - platform: template
     id: propbox_fan
     name: "Status: Fan"
     optimistic: true
     turn_on_action:
-      - http_request.post:
-          url: http://${hostname_fan}/switch/power/turn_on
+      - http_request.post: http://${hostname_fan}/switch/power/turn_on
     turn_off_action:
-      - http_request.post:
-          url: http://${hostname_fan}/switch/power/turn_off
+      - http_request.post: http://${hostname_fan}/switch/power/turn_off
 
 interval:
   - interval: 1min
@@ -215,8 +211,8 @@ script:
           // switch fan on when temperature/humidity is above max, unless humidity/temperature is below min 
           if (
             !id(propbox_fan).state &&
-            (id(temperature).state >= atoi(id(temperature_max).state.c_str()) && id(humidity).state    >= atoi(id(humidity_min).state.c_str())) ||
-            (id(humidity).state    >= atoi(id(humidity_max).state.c_str())    && id(temperature).state >= atoi(id(temperature_min).state.c_str()))
+            ((id(temperature).state >= atoi(id(temperature_max).state.c_str()) && id(humidity).state    >= atoi(id(humidity_min).state.c_str())) ||
+            ( id(humidity).state    >= atoi(id(humidity_max).state.c_str())    && id(temperature).state >= atoi(id(temperature_min).state.c_str())))
           ) {
             id(propbox_fan).turn_on();
           }