diff --git a/Software/src/battery/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp
index 71e987d2..dda9e4bc 100644
--- a/Software/src/battery/BMW-I3-BATTERY.cpp
+++ b/Software/src/battery/BMW-I3-BATTERY.cpp
@@ -3,6 +3,8 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "BMW-I3-BATTERY.h"
+#include "../devboard/utils/pause.h"
+
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis20 = 0;     // will store last time a 20ms CAN Message was send
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index 4aba2657..dff8f188 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "BYD-ATTO-3-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* TODO: 
 - Map all values from battery CAN messages
diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp
index ff9105fb..b9c15bf7 100644
--- a/Software/src/battery/CHADEMO-BATTERY.cpp
+++ b/Software/src/battery/CHADEMO-BATTERY.cpp
@@ -7,6 +7,8 @@
 #include "CHADEMO-BATTERY-INTERNAL.h"
 #include "CHADEMO-BATTERY.h"
 #include "CHADEMO-SHUNTS.h"
+#include "../devboard/utils/pause.h"
+
 
 /* CHADEMO handling runs at 6.25 times the rate of most other code, so, rather than the
  *  default value of 12 (for 12 iterations of the 5s value update loop) * 5 for a 60s timeout,
diff --git a/Software/src/battery/CHADEMO-SHUNTS.cpp b/Software/src/battery/CHADEMO-SHUNTS.cpp
index ec78e616..af733fed 100644
--- a/Software/src/battery/CHADEMO-SHUNTS.cpp
+++ b/Software/src/battery/CHADEMO-SHUNTS.cpp
@@ -22,6 +22,7 @@
 #include "CHADEMO-BATTERY-INTERNAL.h"
 #include "CHADEMO-BATTERY.h"
 #include "CHADEMO-SHUNTS.h"
+#include "../devboard/utils/pause.h"
 
 /* Initial frames received from ISA shunts provide invalid during initialization */
 static int framecount = 0;
diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
index 66136c74..ed6daf84 100644
--- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "IMIEV-CZERO-ION-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 //Code still work in progress, TODO:
 //Figure out if CAN messages need to be sent to keep the system happy?
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
index 720864c2..8de1a8c2 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "JAGUAR-IPACE-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillisKeepAlive = 0;
diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.cpp b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
index 0994a310..07036924 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.cpp
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
@@ -4,6 +4,7 @@
 #include "../devboard/utils/events.h"
 #include "../lib/pierremolinaro-ACAN2517FD/ACAN2517FD.h"
 #include "KIA-E-GMP-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis20ms = 0;   // will store last time a 20ms CAN Message was send
diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
index fbe8eed8..8747e6c7 100644
--- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "KIA-HYUNDAI-64-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis100 = 0;  // will store last time a 100ms CAN Message was send
diff --git a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
index 664c9c27..1b270395 100644
--- a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "KIA-HYUNDAI-HYBRID-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* TODO: 
 - The HEV battery seems to turn off after 1 minute of use. When this happens SOC% stops updating.
diff --git a/Software/src/battery/MG-5-BATTERY.cpp b/Software/src/battery/MG-5-BATTERY.cpp
index 3a4f8a82..7cb49495 100644
--- a/Software/src/battery/MG-5-BATTERY.cpp
+++ b/Software/src/battery/MG-5-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "MG-5-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* TODO: 
 - Get contactor closing working
diff --git a/Software/src/battery/PYLON-BATTERY.cpp b/Software/src/battery/PYLON-BATTERY.cpp
index 7f053f22..d6f41e6d 100644
--- a/Software/src/battery/PYLON-BATTERY.cpp
+++ b/Software/src/battery/PYLON-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "PYLON-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis1000 = 0;  // will store last time a 1s CAN Message was sent
diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
index 75a992c4..304a88b2 100644
--- a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "RENAULT-KANGOO-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* TODO:
 There seems to be some values on the Kangoo that differ between the 22/33 kWh version
diff --git a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
index 126b6b70..1b29361d 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "RENAULT-ZOE-GEN1-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Information in this file is based of the OVMS V3 vehicle_renaultzoe.cpp component 
 https://github.com/openvehicles/Open-Vehicle-Monitoring-System-3/blob/master/vehicle/OVMS.V3/components/vehicle_renaultzoe/src/vehicle_renaultzoe.cpp
diff --git a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
index d90fb3e4..0da8b9a1 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "RENAULT-ZOE-GEN2-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Information in this file is based of the OVMS V3 vehicle_renaultzoe.cpp component 
 https://github.com/openvehicles/Open-Vehicle-Monitoring-System-3/blob/master/vehicle/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.cpp
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
index 797b5290..1a2654d4 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "SANTA-FE-PHEV-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Credits go to maciek16c for these findings!
 https://github.com/maciek16c/hyundai-santa-fe-phev-battery
diff --git a/Software/src/battery/TESLA-BATTERY.cpp b/Software/src/battery/TESLA-BATTERY.cpp
index 5067f971..6085ef0f 100644
--- a/Software/src/battery/TESLA-BATTERY.cpp
+++ b/Software/src/battery/TESLA-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "TESLA-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 /* Credits: Most of the code comes from Per Carlen's bms_comms_tesla_model3.py (https://gitlab.com/pelle8/batt2gen24/) */
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
index 2c927890..ac5784a3 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
@@ -3,6 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "VOLVO-SPA-BATTERY.h"
+#include "../devboard/utils/pause.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis100 = 0;  // will store last time a 100ms CAN Message was send
diff --git a/Software/src/devboard/utils/pause.cpp b/Software/src/devboard/utils/pause.cpp
index 18798956..e2a01960 100644
--- a/Software/src/devboard/utils/pause.cpp
+++ b/Software/src/devboard/utils/pause.cpp
@@ -2,28 +2,26 @@
 #include "../../datalayer/datalayer.h"
 #include "events.h"
 
-
 bool emulator_pause_request_ON = false;
 bool emulator_pause_CAN_send_ON = false;
 bool can_send_CAN = true;
 
-
 battery_pause_status emulator_pause_status = NORMAL;
 
-void setBatteryPause(bool pause_battery,bool pause_CAN) {
-  
+void setBatteryPause(bool pause_battery, bool pause_CAN) {
+
   emulator_pause_CAN_send_ON = pause_CAN;
 
   if (pause_battery) {
 
     set_event(EVENT_PAUSE_BEGIN, 1);
     emulator_pause_request_ON = true;
-    datalayer.battery.status.max_discharge_power_W = 0; 
-    datalayer.battery.status.max_charge_power_W = 0; 
-    #ifdef DOUBLE_BATTERY
-    datalayer.battery2.status.max_discharge_power_W = 0; 
-    datalayer.battery2.status.max_charge_power_W = 0; 
-    #endif
+    datalayer.battery.status.max_discharge_power_W = 0;
+    datalayer.battery.status.max_charge_power_W = 0;
+#ifdef DOUBLE_BATTERY
+    datalayer.battery2.status.max_discharge_power_W = 0;
+    datalayer.battery2.status.max_charge_power_W = 0;
+#endif
 
     emulator_pause_status = PAUSING;
   } else {
@@ -37,15 +35,14 @@ void setBatteryPause(bool pause_battery,bool pause_CAN) {
 
 /// @brief handle emulator pause status
 /// @return true if CAN messages should be sent to battery, false if not
-void  emulator_pause_state_send_CAN_battery() {
-
+void emulator_pause_state_send_CAN_battery() {
 
   if (emulator_pause_status == NORMAL)
     can_send_CAN = true;
 
   // in some inverters this values are not accurate, so we need to check if we are consider 1.8 amps as the limit
   if (emulator_pause_request_ON && emulator_pause_status == PAUSING && datalayer.battery.status.current_dA < 18 &&
-      datalayer.battery.status.current_dA > -18 ) {
+      datalayer.battery.status.current_dA > -18) {
     emulator_pause_status = PAUSED;
   }
 
@@ -70,4 +67,4 @@ std::string get_emulator_pause_status() {
     default:
       return "UNKNOWN";
   }
-}
\ No newline at end of file
+}
diff --git a/Software/src/devboard/utils/pause.h b/Software/src/devboard/utils/pause.h
index 5524db8e..f0908595 100644
--- a/Software/src/devboard/utils/pause.h
+++ b/Software/src/devboard/utils/pause.h
@@ -3,7 +3,6 @@
 
 #include <string>
 
-
 //battery pause status
 enum battery_pause_status { NORMAL = 0, PAUSING = 1, PAUSED = 2, RESUMING = 3 };
 extern bool emulator_pause_request_ON;
@@ -11,7 +10,7 @@ extern bool emulator_pause_CAN_send_ON;
 extern battery_pause_status emulator_pause_status;
 extern bool can_send_CAN;
 
-void setBatteryPause(bool pause_battery,bool pause_CAN) ;
+void setBatteryPause(bool pause_battery, bool pause_CAN);
 void emulator_pause_state_send_CAN_battery();
 std::string get_emulator_pause_status();
-#endif
\ No newline at end of file
+#endif
diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp
index 9ab41c72..d6f71976 100644
--- a/Software/src/devboard/webserver/webserver.cpp
+++ b/Software/src/devboard/webserver/webserver.cpp
@@ -717,9 +717,7 @@ String processor(const String& var) {
     if (emulator_pause_status == NORMAL)
       content += "<h4>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
     else
-      content +=
-          "<h4 style='color: red;'>Pause status: " + String(get_emulator_pause_status().c_str()) +
-          " </h4>";
+      content += "<h4 style='color: red;'>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
 
     // Close the block
     content += "</div>";
@@ -799,9 +797,7 @@ String processor(const String& var) {
     if (emulator_pause_status == NORMAL)
       content += "<h4>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
     else
-      content +=
-          "<h4 style='color: red;'>Pause status: " + String(get_emulator_pause_status().c_str()) +
-          " </h4>";
+      content += "<h4 style='color: red;'>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
 
     content += "</div>";
     content += "</div>";