diff --git a/client/platforms/windows/daemon/windowsfirewall.cpp b/client/platforms/windows/daemon/windowsfirewall.cpp
index c06b793e..63f7818b 100644
--- a/client/platforms/windows/daemon/windowsfirewall.cpp
+++ b/client/platforms/windows/daemon/windowsfirewall.cpp
@@ -192,7 +192,7 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
     }
     IPAddress allv6("::/0");
     if (!blockTrafficTo(allv6, MED_WEIGHT,
-                    "Block Internet", "killswitch")) {
+                        "Block Internet", "killswitch")) {
       return false;
     }
   } else
@@ -203,8 +203,8 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
   FW_OK(allowTrafficForAppOnAll(getCurrentPath(), MAX_WEIGHT,
                                 "Allow all for AmneziaVPN.exe"));
   FW_OK(blockTrafficOnPort(53, MED_WEIGHT, "Block all DNS"));
-  FW_OK(
-      allowLoopbackTraffic(MED_WEIGHT, "Allow Loopback traffic on device %1"));
+  FW_OK(allowLoopbackTraffic(MED_WEIGHT,
+                             "Allow Loopback traffic on device %1"));
 
   logger.debug() << "Killswitch on! Rules:" << m_activeRules.length();
   return true;
@@ -290,7 +290,7 @@ bool WindowsFirewall::enablePeerTraffic(const InterfaceConfig& config) {
       logger.debug() << "excludedAddresses range: " << i;
 
       if (!allowTrafficTo(i, HIGH_WEIGHT,
-                               "Allow Ecxlude route", config.m_serverPublicKey)) {
+                          "Allow Ecxlude route", config.m_serverPublicKey)) {
         return false;
       }
     }
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index c7b224bf..c5c569db 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -251,7 +251,6 @@ void SettingsController::toggleKillSwitch(bool enable)
     } else {
         emit strictKillSwitchEnabledChanged(isStrictKillSwitchEnabled());
     }
-
 }
 
 bool SettingsController::isStrictKillSwitchEnabled()
diff --git a/client/ui/qml/Controls2/BaseHeaderType.qml b/client/ui/qml/Controls2/BaseHeaderType.qml
index fbb6ba18..eb7fe36f 100644
--- a/client/ui/qml/Controls2/BaseHeaderType.qml
+++ b/client/ui/qml/Controls2/BaseHeaderType.qml
@@ -42,4 +42,4 @@ Item {
             visible: root.descriptionText !== ""
         }
     }
-} 
\ No newline at end of file
+} 
diff --git a/client/ui/qml/Controls2/HeaderTypeWithButton.qml b/client/ui/qml/Controls2/HeaderTypeWithButton.qml
index 8258f8d9..7feff3ce 100644
--- a/client/ui/qml/Controls2/HeaderTypeWithButton.qml
+++ b/client/ui/qml/Controls2/HeaderTypeWithButton.qml
@@ -41,4 +41,4 @@ BaseHeaderType {
             actionButtonFunction()
         }
     }
-} 
\ No newline at end of file
+} 
diff --git a/client/ui/qml/Controls2/HeaderTypeWithSwitcher.qml b/client/ui/qml/Controls2/HeaderTypeWithSwitcher.qml
index 81a078d1..2fa4e735 100644
--- a/client/ui/qml/Controls2/HeaderTypeWithSwitcher.qml
+++ b/client/ui/qml/Controls2/HeaderTypeWithSwitcher.qml
@@ -25,4 +25,4 @@ BaseHeaderType {
             }
         }
     }
-} 
\ No newline at end of file
+} 
diff --git a/client/ui/qml/Pages2/PageSettingsKillSwitch.qml b/client/ui/qml/Pages2/PageSettingsKillSwitch.qml
index 4098cc40..10b7305c 100644
--- a/client/ui/qml/Pages2/PageSettingsKillSwitch.qml
+++ b/client/ui/qml/Pages2/PageSettingsKillSwitch.qml
@@ -37,7 +37,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                headerText: qsTr("Kill Switch")
+                headerText: qsTr("KillSwitch")
                 descriptionText: qsTr("Enable to ensure network traffic goes through a secure VPN tunnel, preventing accidental exposure of your IP and DNS queries if the connection drops")
 
                 showSwitcher: true
@@ -65,7 +65,7 @@ PageType {
                 enabled: SettingsController.isKillSwitchEnabled && !ConnectionController.isConnected
                 checked: !SettingsController.strictKillSwitchEnabled
 
-                text: qsTr("Soft Kill Switch")
+                text: qsTr("Soft KillSwitch")
                 descriptionText: qsTr("Internet connection is blocked if VPN connection drops accidentally")
 
                 onClicked: {
@@ -84,7 +84,7 @@ PageType {
                 enabled: SettingsController.isKillSwitchEnabled && !ConnectionController.isConnected
                 checked: SettingsController.strictKillSwitchEnabled
 
-                text: qsTr("Strict Kill Switch")
+                text: qsTr("Strict KillSwitch")
                 descriptionText: qsTr("Internet connection is blocked even if VPN was turned off manually or not started")
 
                 onClicked: {
diff --git a/service/server/killswitch.h b/service/server/killswitch.h
index a468c6c2..56ffbca5 100644
--- a/service/server/killswitch.h
+++ b/service/server/killswitch.h
@@ -15,8 +15,8 @@ public:
     bool refresh(bool enabled);
     bool disableKillSwitch();
     bool disableAllTraffic();
-    bool enablePeerTraffic( const QJsonObject &configStr);
-    bool enableKillSwitch( const QJsonObject &configStr, int vpnAdapterIndex);
+    bool enablePeerTraffic(const QJsonObject &configStr);
+    bool enableKillSwitch(const QJsonObject &configStr, int vpnAdapterIndex);
     bool allowTrafficTo(const QStringList &ranges);
     bool isStrictKillSwitchEnabled();