diff --git a/src/Power.cpp b/src/Power.cpp
index 5792bee1e..a4c9ed6f8 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -413,7 +413,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #ifdef EXT_CHRG_DETECT
         return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
 #else
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(DISABLE_INA_CHARGING_DETECTION)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) &&           \
+    !defined(DISABLE_INA_CHARGING_DETECTION)
         if (hasINA()) {
             // get current flow from INA sensor - negative value means power flowing into the battery
             // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
@@ -472,7 +473,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
         return 0;
     }
 
-    int16_t getINACurrent() {
+    int16_t getINACurrent()
+    {
         if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
             return ina219Sensor.getCurrentMa();
         } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA3221].first ==
@@ -1176,4 +1178,4 @@ bool Power::lipoInit()
 {
     return false;
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/CurrentSensor.h b/src/modules/Telemetry/Sensor/CurrentSensor.h
index b026cb852..9827a9aa4 100644
--- a/src/modules/Telemetry/Sensor/CurrentSensor.h
+++ b/src/modules/Telemetry/Sensor/CurrentSensor.h
@@ -10,5 +10,4 @@ class CurrentSensor
     virtual int16_t getCurrentMa() = 0;
 };
 
-
 #endif
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.h b/src/modules/Telemetry/Sensor/INA219Sensor.h
index 18bfd93f7..9b6a2fcca 100644
--- a/src/modules/Telemetry/Sensor/INA219Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.h
@@ -3,9 +3,9 @@
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "CurrentSensor.h"
 #include "TelemetrySensor.h"
 #include "VoltageSensor.h"
-#include "CurrentSensor.h"
 #include <Adafruit_INA219.h>
 
 class INA219Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
@@ -24,4 +24,4 @@ class INA219Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
     virtual int16_t getCurrentMa() override;
 };
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA3221Sensor.h b/src/modules/Telemetry/Sensor/INA3221Sensor.h
index 2f40f091f..8eeda3e02 100644
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.h
@@ -3,9 +3,9 @@
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "CurrentSensor.h"
 #include "TelemetrySensor.h"
 #include "VoltageSensor.h"
-#include "CurrentSensor.h"
 #include <INA3221.h>
 
 class INA3221Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor