diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc
index ded8dde..0419688 100644
--- a/source/HomeAssistantApp.mc
+++ b/source/HomeAssistantApp.mc
@@ -143,7 +143,7 @@ class HomeAssistantApp extends Application.AppBase {
             } else {
                 ret = [new WatchUi.View(), new WatchUi.BehaviorDelegate()];
             }
-            // Separated from Settings.update() in order to call after fetchMenuConfig() and not call it on changes settings.
+            // Separated from Settings.update() in order to call after fetchMenuConfig() and not call it on changed settings.
             Settings.webhook();
             return ret;
         }
@@ -488,11 +488,11 @@ class HomeAssistantApp extends Application.AppBase {
                                 "template" => template
                             });
                         }
-                    if (item instanceof HomeAssistantToggleMenuItem) {
-                        mTemplates.put(i.toString() + "t", {
-                            "template" => (item as HomeAssistantToggleMenuItem).getToggleTemplate()
-                        });
-                    }
+                        if (item instanceof HomeAssistantToggleMenuItem) {
+                            mTemplates.put(i.toString() + "t", {
+                                "template" => (item as HomeAssistantToggleMenuItem).getToggleTemplate()
+                            });
+                        }
                     }
                 }
                 // https://developers.home-assistant.io/docs/api/native-app-integration/sending-data/#render-templates
diff --git a/source/HomeAssistantTapMenuItem.mc b/source/HomeAssistantTapMenuItem.mc
index 04881d3..d03d9b1 100644
--- a/source/HomeAssistantTapMenuItem.mc
+++ b/source/HomeAssistantTapMenuItem.mc
@@ -100,10 +100,10 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
                 WatchUi.pushView(
                     dialog,
                     new WifiLteExecutionConfirmDelegate({
-                        :type => "service",
+                        :type    => "service",
                         :service => mService,
-                        :data => mData,
-                        :exit => mExit,
+                        :data    => mData,
+                        :exit    => mExit,
                     }, dialog),
                     WatchUi.SLIDE_LEFT
                 );
@@ -112,9 +112,9 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
                 WatchUi.pushView(
                     view,
                     new HomeAssistantConfirmationDelegate({
-                        :callback       => method(:onConfirm),
+                        :callback         => method(:onConfirm),
                         :confirmationView => view,
-                        :state          => false,
+                        :state            => false,
                     }),
                     WatchUi.SLIDE_IMMEDIATE
                 );