diff --git a/src/detect/i2cScan.h b/src/detect/i2cScan.h
index 6efe6b4e5..0189677bd 100644
--- a/src/detect/i2cScan.h
+++ b/src/detect/i2cScan.h
@@ -1,11 +1,11 @@
 #include "../configuration.h"
 #include "../main.h"
-#include <Wire.h>
 #include "mesh/generated/meshtastic/telemetry.pb.h"
+#include <Wire.h>
 
 // AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
 #ifndef XPOWERS_AXP192_AXP2101_ADDRESS
-#define XPOWERS_AXP192_AXP2101_ADDRESS      0x34
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
 #endif
 
 #if HAS_WIRE
@@ -16,27 +16,27 @@ void printATECCInfo()
     atecc.readConfigZone(false);
 
     LOG_DEBUG("ATECC608B Serial Number: ");
-    for (int i = 0 ; i < 9 ; i++) {
-        LOG_DEBUG("%02x",atecc.serialNumber[i]);
+    for (int i = 0; i < 9; i++) {
+        LOG_DEBUG("%02x", atecc.serialNumber[i]);
     }
 
     LOG_DEBUG(", Rev Number: ");
-    for (int i = 0 ; i < 4 ; i++) {
-        LOG_DEBUG("%02x",atecc.revisionNumber[i]);
+    for (int i = 0; i < 4; i++) {
+        LOG_DEBUG("%02x", atecc.revisionNumber[i]);
     }
     LOG_DEBUG("\n");
 
-    LOG_DEBUG("ATECC608B Config %s",atecc.configLockStatus ? "Locked" : "Unlocked");
-    LOG_DEBUG(", Data %s",atecc.dataOTPLockStatus ? "Locked" : "Unlocked");
-    LOG_DEBUG(", Slot 0 %s\n",atecc.slot0LockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG("ATECC608B Config %s", atecc.configLockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG(", Data %s", atecc.dataOTPLockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG(", Slot 0 %s\n", atecc.slot0LockStatus ? "Locked" : "Unlocked");
 
     if (atecc.configLockStatus && atecc.dataOTPLockStatus && atecc.slot0LockStatus) {
         if (atecc.generatePublicKey() == false) {
             LOG_DEBUG("ATECC608B Error generating public key\n");
         } else {
             LOG_DEBUG("ATECC608B Public Key: ");
-            for (int i = 0 ; i < 64 ; i++) {
-                LOG_DEBUG("%02x",atecc.publicKey64Bytes[i]);
+            for (int i = 0; i < 64; i++) {
+                LOG_DEBUG("%02x", atecc.publicKey64Bytes[i]);
             }
             LOG_DEBUG("\n");
         }
@@ -44,7 +44,8 @@ void printATECCInfo()
 #endif
 }
 
-uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
+uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length)
+{
     uint16_t value = 0x00;
     Wire.beginTransmission(address);
     Wire.write(reg);
@@ -54,7 +55,7 @@ uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
     LOG_DEBUG("Wire.available() = %d\n", Wire.available());
     if (Wire.available() == 2) {
         // Read MSB, then LSB
-        value = (uint16_t)Wire.read() << 8;  
+        value = (uint16_t)Wire.read() << 8;
         value |= Wire.read();
     } else if (Wire.available()) {
         value = Wire.read();
@@ -81,7 +82,7 @@ uint8_t oled_probe(byte addr)
 
         if (r == 0x08 || r == 0x00) {
             o_probe = 2; // SH1106
-        } else if ( r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07) {
+        } else if (r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07) {
             o_probe = 1; // SSD1306
         }
         c++;
@@ -126,17 +127,17 @@ void scanI2Cdevice()
             }
 #endif
 #ifdef RV3028_RTC
-            if (addr == RV3028_RTC){
+            if (addr == RV3028_RTC) {
                 rtc_found = addr;
                 LOG_INFO("RV3028 RTC found\n");
                 Melopero_RV3028 rtc;
                 rtc.initI2C();
-                rtc.writeToRegister(0x35,0x07); // no Clkout
-                rtc.writeToRegister(0x37,0xB4);
+                rtc.writeToRegister(0x35, 0x07); // no Clkout
+                rtc.writeToRegister(0x37, 0xB4);
             }
 #endif
 #ifdef PCF8563_RTC
-            if (addr == PCF8563_RTC){
+            if (addr == PCF8563_RTC) {
                 rtc_found = addr;
                 LOG_INFO("PCF8563 RTC found\n");
             }
@@ -225,7 +226,7 @@ void scanI2Cdevice()
     if (nDevices == 0)
         LOG_INFO("No I2C devices found\n");
     else
-        LOG_INFO("%i I2C devices found\n",nDevices);
+        LOG_INFO("%i I2C devices found\n", nDevices);
 }
 #else
 void scanI2Cdevice() {}
diff --git a/src/error.h b/src/error.h
index 4c309e395..087215b1d 100644
--- a/src/error.h
+++ b/src/error.h
@@ -8,4 +8,5 @@
 #define RECORD_CRITICALERROR(code) recordCriticalError(code, __LINE__, __FILE__)
 
 /// Record an error that should be reported via analytics
-void recordCriticalError(CriticalErrorCode code = CriticalErrorCode_UNSPECIFIED, uint32_t address = 0, const char *filename = NULL);
+void recordCriticalError(CriticalErrorCode code = CriticalErrorCode_UNSPECIFIED, uint32_t address = 0,
+                         const char *filename = NULL);
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index ad09368c4..abaeec660 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -34,8 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
-#include "modules/TextMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
+#include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
@@ -69,7 +69,7 @@ static uint32_t targetFramerate = IDLE_FRAMERATE;
 static char btPIN[16] = "888888";
 
 uint32_t logo_timeout = 5000; // 4 seconds for EACH logo
-    
+
 // This image definition is here instead of images.h because it's modified dynamically by the drawBattery function
 uint8_t imgBattery[16] = {0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C};
 
@@ -97,9 +97,9 @@ static uint16_t displayWidth, displayHeight;
 
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
 // The screen is bigger so use bigger fonts
-#define FONT_SMALL ArialMT_Plain_16 // Height: 19
+#define FONT_SMALL ArialMT_Plain_16  // Height: 19
 #define FONT_MEDIUM ArialMT_Plain_24 // Height: 28
-#define FONT_LARGE ArialMT_Plain_24 // Height: 28
+#define FONT_LARGE ArialMT_Plain_24  // Height: 28
 #else
 #ifdef OLED_RU
 #define FONT_SMALL ArialMT_Plain_10_RU
@@ -107,7 +107,7 @@ static uint16_t displayWidth, displayHeight;
 #define FONT_SMALL ArialMT_Plain_10 // Height: 13
 #endif
 #define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
-#define FONT_LARGE ArialMT_Plain_24 // Height: 28
+#define FONT_LARGE ArialMT_Plain_24  // Height: 28
 #endif
 
 #define fontHeight(font) ((font)[1] + 1) // height is position 1
@@ -118,7 +118,6 @@ static uint16_t displayWidth, displayHeight;
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
 
-
 /**
  * Draw the icon with extra info printed around the corners
  */
@@ -236,7 +235,7 @@ static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
     display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
     display->drawString(64 + x, y + FONT_HEIGHT_SMALL, getDeviceName());
     display->setTextAlignment(TEXT_ALIGN_LEFT);
-    
+
     if ((millis() / 10000) % 2) {
         display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
         display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
@@ -292,7 +291,7 @@ static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state,
     display->drawString(x_offset + x, y_offset + y, "Bluetooth");
 
     display->setFont(FONT_SMALL);
-    y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_MEDIUM -4   : y_offset + FONT_HEIGHT_MEDIUM + 5;
+    y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_MEDIUM - 4 : y_offset + FONT_HEIGHT_MEDIUM + 5;
     display->drawString(x_offset + x, y_offset + y, "Enter this code");
 
     display->setFont(FONT_LARGE);
@@ -302,7 +301,7 @@ static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state,
     display->drawString(x_offset + x, y_offset + y, pin);
 
     display->setFont(FONT_SMALL);
-    String deviceName =  "Name: ";
+    String deviceName = "Name: ";
     deviceName.concat(getDeviceName());
     y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_LARGE - 6 : y_offset + FONT_HEIGHT_LARGE + 5;
     display->drawString(x_offset + x, y_offset + y, deviceName);
@@ -332,7 +331,8 @@ static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
     display->setFont(FONT_SMALL);
     display->setTextAlignment(TEXT_ALIGN_LEFT);
-    display->drawStringMaxWidth(0 + x, 2 + y + FONT_HEIGHT_SMALL *2, x + display->getWidth(), "Please be patient and do not power off.");
+    display->drawStringMaxWidth(0 + x, 2 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(),
+                                "Please be patient and do not power off.");
 }
 
 /// Draw the last text message we received
@@ -354,8 +354,7 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
 // Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled
 static bool shouldDrawMessage(const MeshPacket *packet)
 {
-    return packet->from != 0 && !moduleConfig.range_test.enabled &&
-           !moduleConfig.store_forward.enabled;
+    return packet->from != 0 && !moduleConfig.range_test.enabled && !moduleConfig.store_forward.enabled;
 }
 
 /// Draw the last text message we received
@@ -381,7 +380,7 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
         display->setColor(BLACK);
     }
     display->drawStringf(0 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
-    if(config.display.heading_bold) {
+    if (config.display.heading_bold) {
         display->drawStringf(1 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
     }
     display->setColor(WHITE);
@@ -477,7 +476,7 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *no
     display->drawFastImage(x, y, 8, 8, imgUser);
 #endif
     display->drawString(x + 10, y - 2, usersString);
-    if(config.display.heading_bold)
+    if (config.display.heading_bold)
         display->drawString(x + 11, y - 2, usersString);
 }
 
@@ -487,20 +486,20 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
     if (config.position.fixed_position) {
         // GPS coordinates are currently fixed
         display->drawString(x - 1, y - 2, "Fixed GPS");
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x, y - 2, "Fixed GPS");
         return;
     }
     if (!gps->getIsConnected()) {
         display->drawString(x, y - 2, "No GPS");
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 1, y - 2, "No GPS");
         return;
     }
     display->drawFastImage(x, y, 6, 8, gps->getHasLock() ? imgPositionSolid : imgPositionEmpty);
     if (!gps->getHasLock()) {
         display->drawString(x + 8, y - 2, "No sats");
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 9, y - 2, "No sats");
         return;
     } else {
@@ -523,24 +522,24 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
         // Draw the number of satellites
         snprintf(satsString, sizeof(satsString), "%u", gps->getNumSatellites());
         display->drawString(x + 34, y - 2, satsString);
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 35, y - 2, satsString);
     }
 }
 
-//Draw status when gps is disabled by PMU
+// Draw status when gps is disabled by PMU
 static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
-#ifdef HAS_PMU    
+#ifdef HAS_PMU
     String displayLine = "GPS disabled";
     int16_t xPos = display->getStringWidth(displayLine);
 
-    if (!config.position.gps_enabled){
+    if (!config.position.gps_enabled) {
         display->drawString(x + xPos, y, displayLine);
-#ifdef GPS_POWER_TOGGLE 
+#ifdef GPS_POWER_TOGGLE
         display->drawString(x + xPos, y - 2 + FONT_HEIGHT_SMALL, " by button");
 #endif
-        //display->drawString(x + xPos, y + 2, displayLine);
+        // display->drawString(x + xPos, y + 2, displayLine);
     }
 #endif
 }
@@ -582,22 +581,23 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
         if (gpsFormat != Config_DisplayConfig_GpsCoordinateFormat_DMS) {
             char coordinateLine[22];
             if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_DEC) { // Decimal Degrees
-                snprintf(coordinateLine, sizeof(coordinateLine), "%f %f", geoCoord.getLatitude() * 1e-7, geoCoord.getLongitude() * 1e-7);
+                snprintf(coordinateLine, sizeof(coordinateLine), "%f %f", geoCoord.getLatitude() * 1e-7,
+                         geoCoord.getLongitude() * 1e-7);
             } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_UTM) { // Universal Transverse Mercator
                 snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %06u %07u", geoCoord.getUTMZone(), geoCoord.getUTMBand(),
-                        geoCoord.getUTMEasting(), geoCoord.getUTMNorthing());
+                         geoCoord.getUTMEasting(), geoCoord.getUTMNorthing());
             } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_MGRS) { // Military Grid Reference System
-                snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(), geoCoord.getMGRSBand(),
-                        geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(), geoCoord.getMGRSEasting(),
-                        geoCoord.getMGRSNorthing());
+                snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(),
+                         geoCoord.getMGRSBand(), geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(),
+                         geoCoord.getMGRSEasting(), geoCoord.getMGRSNorthing());
             } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_OLC) { // Open Location Code
                 geoCoord.getOLCCode(coordinateLine);
-            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_OSGR) { // Ordnance Survey Grid Reference
+            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_OSGR) {  // Ordnance Survey Grid Reference
                 if (geoCoord.getOSGRE100k() == 'I' || geoCoord.getOSGRN100k() == 'I') // OSGR is only valid around the UK region
                     snprintf(coordinateLine, sizeof(coordinateLine), "%s", "Out of Boundary");
                 else
-                    snprintf(coordinateLine, sizeof(coordinateLine), "%1c%1c %05u %05u", geoCoord.getOSGRE100k(), geoCoord.getOSGRN100k(),
-                            geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
+                    snprintf(coordinateLine, sizeof(coordinateLine), "%1c%1c %05u %05u", geoCoord.getOSGRE100k(),
+                             geoCoord.getOSGRN100k(), geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
             }
 
             // If fixed position, display text "Fixed GPS" alternating with the coordinates.
@@ -614,10 +614,10 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
         } else {
             char latLine[22];
             char lonLine[22];
-            snprintf(latLine, sizeof(latLine), "%2i° %2i' %2u\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(), geoCoord.getDMSLatSec(),
-                    geoCoord.getDMSLatCP());
-            snprintf(lonLine, sizeof(lonLine), "%3i° %2i' %2u\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(), geoCoord.getDMSLonSec(),
-                    geoCoord.getDMSLonCP());
+            snprintf(latLine, sizeof(latLine), "%2i° %2i' %2u\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(),
+                     geoCoord.getDMSLatSec(), geoCoord.getDMSLatCP());
+            snprintf(lonLine, sizeof(lonLine), "%3i° %2i' %2u\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(),
+                     geoCoord.getDMSLonSec(), geoCoord.getDMSLonCP());
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(latLine))) / 2, y - FONT_HEIGHT_SMALL * 1, latLine);
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(lonLine))) / 2, y, lonLine);
         }
@@ -653,8 +653,8 @@ class Point
 
     void scale(float f)
     {
-        //We use -f here to counter the flip that happens
-        //on the y axis when drawing and rotating on screen
+        // We use -f here to counter the flip that happens
+        // on the y axis when drawing and rotating on screen
         x *= f;
         y *= -f;
     }
@@ -713,7 +713,7 @@ static uint16_t getCompassDiam(OLEDDisplay *display)
         offset = FONT_HEIGHT_SMALL;
 
     // get the smaller of the 2 dimensions and subtract 20
-    if(display->getWidth() > (display->getHeight() - offset)) {
+    if (display->getWidth() > (display->getHeight() - offset)) {
         diam = display->getHeight() - offset;
         // if 2/3 of the other size would be smaller, use that
         if (diam > (display->getWidth() * 2 / 3)) {
@@ -725,7 +725,7 @@ static uint16_t getCompassDiam(OLEDDisplay *display)
             diam = (display->getHeight() - offset) * 2 / 3;
         }
     }
-    
+
     return diam - 20;
 };
 
@@ -756,10 +756,10 @@ static void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t comp
 // Draw north
 static void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
 {
-    //If north is supposed to be at the top of the compass we want rotation to be +0
-    if(config.display.compass_north_top)
+    // If north is supposed to be at the top of the compass we want rotation to be +0
+    if (config.display.compass_north_top)
         myHeading = -0;
-    
+
     Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
     Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
     Point *rosePoints[] = {&N1, &N2, &N3, &N4};
@@ -874,7 +874,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
                 GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
             // If the top of the compass is a static north then bearingToOther can be drawn on the compass directly
             // If the top of the compass is not a static north we need adjust bearingToOther based on heading
-            if(!config.display.compass_north_top)
+            if (!config.display.compass_north_top)
                 bearingToOther -= myHeading;
             drawNodeHeading(display, compassX, compassY, bearingToOther);
         }
@@ -1000,8 +1000,8 @@ void Screen::setup()
 #ifdef SCREEN_MIRROR
     dispdev.mirrorScreen();
 #else
-    // Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically flip it.
-    // If you have a headache now, you're welcome.
+    // Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically
+    // flip it. If you have a headache now, you're welcome.
     if (!config.display.flip_screen) {
         dispdev.flipScreenVertically();
     }
@@ -1071,7 +1071,7 @@ int32_t Screen::runOnce()
             static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
             ui.setFrames(bootOEMFrames, bootOEMFrameCount);
             ui.update();
-#ifndef USE_EINK            
+#ifndef USE_EINK
             ui.update();
 #endif
             showingOEMBootScreen = false;
@@ -1414,7 +1414,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // Display power status
     if (powerStatus->getHasBattery()) {
         if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
-            drawBattery(display, x , y + 2, imgBattery, powerStatus);
+            drawBattery(display, x, y + 2, imgBattery, powerStatus);
         } else {
             drawBattery(display, x + 1, y + 3, imgBattery, powerStatus);
         }
@@ -1432,7 +1432,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 3, nodeStatus);
     }
     // Display GPS status
-    if (!config.position.gps_enabled){
+    if (!config.position.gps_enabled) {
         int16_t yPos = y + 2;
 #ifdef GPS_POWER_TOGGLE
         yPos = (y + 10 + FONT_HEIGHT_SMALL);
@@ -1451,27 +1451,36 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     display->drawString(x, y + FONT_HEIGHT_SMALL, channelStr);
     // Draw our hardware ID to assist with bluetooth pairing. Either prefix with Info or S&F Logo
     if (moduleConfig.store_forward.enabled) {
-#ifdef ARCH_ESP32        
-        if (millis() - storeForwardModule->lastHeartbeat > (storeForwardModule->heartbeatInterval * 1200)) { //no heartbeat, overlap a bit
+#ifdef ARCH_ESP32
+        if (millis() - storeForwardModule->lastHeartbeat >
+            (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL1);
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL2);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
+                                   imgQuestionL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+                                   imgQuestionL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8, imgQuestion);
+            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8,
+                                   imgQuestion);
 #endif
         } else {
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8, imgSFL1);
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8, imgSFL2);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
+                                   imgSFL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8,
+                                   imgSFL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 11, 8, imgSF);
+            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 11, 8,
+                                   imgSF);
 #endif
         }
-#endif        
+#endif
     } else {
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgInfoL1);
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8, imgInfoL2);
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
+                               imgInfoL1);
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+                               imgInfoL2);
 #else
         display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8, imgInfo);
 #endif
@@ -1510,16 +1519,16 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
     if (WiFi.status() != WL_CONNECTED) {
         display->drawString(x, y, String("WiFi: Not Connected"));
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 1, y, String("WiFi: Not Connected"));
     } else {
         display->drawString(x, y, String("WiFi: Connected"));
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 1, y, String("WiFi: Connected"));
 
         display->drawString(x + SCREEN_WIDTH - display->getStringWidth("RSSI " + String(WiFi.RSSI())), y,
                             "RSSI " + String(WiFi.RSSI()));
-        if(config.display.heading_bold) {
+        if (config.display.heading_bold) {
             display->drawString(x + SCREEN_WIDTH - display->getStringWidth("RSSI " + String(WiFi.RSSI())) - 1, y,
                                 "RSSI " + String(WiFi.RSSI()));
         }
@@ -1650,12 +1659,12 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
         // Line 1
         display->drawString(x, y, batStr);
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 1, y, batStr);
     } else {
         // Line 1
         display->drawString(x, y, String("USB"));
-        if(config.display.heading_bold)
+        if (config.display.heading_bold)
             display->drawString(x + 1, y, String("USB"));
     }
 
@@ -1689,7 +1698,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     }
 
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
-    if(config.display.heading_bold)
+    if (config.display.heading_bold)
         display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
 
     // Line 2
@@ -1740,17 +1749,16 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     char chUtil[13];
     snprintf(chUtil, sizeof(chUtil), "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-if (config.position.gps_enabled) {
-    // Line 3
-    if (config.display.gps_format !=
-        Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
-        drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
+    if (config.position.gps_enabled) {
+        // Line 3
+        if (config.display.gps_format != Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
+            drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
 
-    // Line 4
-    drawGPScoordinates(display, x, y + FONT_HEIGHT_SMALL * 3, gpsStatus);
-} else {
-    drawGPSpowerstat(display, x - (SCREEN_WIDTH / 4), y + FONT_HEIGHT_SMALL * 2, gpsStatus);
-}
+        // Line 4
+        drawGPScoordinates(display, x, y + FONT_HEIGHT_SMALL * 3, gpsStatus);
+    } else {
+        drawGPSpowerstat(display, x - (SCREEN_WIDTH / 4), y + FONT_HEIGHT_SMALL * 2, gpsStatus);
+    }
     /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
     if (heartbeat)
diff --git a/src/main.h b/src/main.h
index 1e02d7c79..27aa06d6c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <map>
 #include "GPSStatus.h"
 #include "NodeStatus.h"
 #include "PowerStatus.h"
 #include "graphics/Screen.h"
 #include "mesh/generated/meshtastic/telemetry.pb.h"
+#include <map>
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include <SparkFun_ATECCX08a_Arduino_Library.h>
 #endif
diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index f0b6edff1..7c5781879 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -157,7 +157,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
 
         if (info) {
             LOG_INFO("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->last_heard, info->user.id,
-                      info->user.long_name);
+                     info->user.long_name);
             fromRadioScratch.which_payload_variant = FromRadio_node_info_tag;
             fromRadioScratch.node_info = *info;
             // Stay in current state until done sending nodeinfos
@@ -364,7 +364,7 @@ bool PhoneAPI::available()
     case STATE_SEND_MODULECONFIG:
     case STATE_SEND_COMPLETE_ID:
         return true;
-        
+
     case STATE_SEND_NODEINFO:
         if (!nodeInfoForPhone)
             nodeInfoForPhone = nodeDB.readNextInfo();
diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h
index ff1e7347c..bed917af2 100644
--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -16,14 +16,15 @@
  * Eventually there should be once instance of this class for each live connection (because it has a bit of state
  * for that connection)
  */
-class PhoneAPI : public Observer<uint32_t> // FIXME, we shouldn't be inheriting from Observer, instead use CallbackObserver as a member
+class PhoneAPI
+    : public Observer<uint32_t> // FIXME, we shouldn't be inheriting from Observer, instead use CallbackObserver as a member
 {
     enum State {
-        STATE_SEND_NOTHING, // Initial state, don't send anything until the client starts asking for config
-        STATE_SEND_MY_INFO, // send our my info record
-        STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
-        STATE_SEND_CHANNELS, // Send all channels
-        STATE_SEND_CONFIG, // Replacement for the old Radioconfig
+        STATE_SEND_NOTHING,      // Initial state, don't send anything until the client starts asking for config
+        STATE_SEND_MY_INFO,      // send our my info record
+        STATE_SEND_NODEINFO,     // states progress in this order as the device sends to to the client
+        STATE_SEND_CHANNELS,     // Send all channels
+        STATE_SEND_CONFIG,       // Replacement for the old Radioconfig
         STATE_SEND_MODULECONFIG, // Send Module specific config
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings
@@ -65,7 +66,7 @@ class PhoneAPI : public Observer<uint32_t> // FIXME, we shouldn't be inheriting
     // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
     // Unregisters our observer.  A closed connection **can** be reopened by calling init again.
     virtual void close();
-    
+
     /**
      * Handle a ToRadio protobuf
      * @return true true if a packet was queued for sending (so that caller can yield)
@@ -95,7 +96,7 @@ class PhoneAPI : public Observer<uint32_t> // FIXME, we shouldn't be inheriting
 
     /** the last msec we heard from the client on the other side of this link */
     uint32_t lastContactMsec = 0;
-    
+
     /// Hookable to find out when connection changes
     virtual void onConnectionChanged(bool connected) {}
 
diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
index 2b0f7bd06..aadfe1f54 100644
--- a/src/mesh/mesh-pb-constants.h
+++ b/src/mesh/mesh-pb-constants.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mesh/generated/meshtastic/mesh.pb.h"
-#include "mesh/generated/meshtastic/localonly.pb.h"
-#include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "mesh/generated/meshtastic/admin.pb.h"
+#include "mesh/generated/meshtastic/deviceonly.pb.h"
+#include "mesh/generated/meshtastic/localonly.pb.h"
+#include "mesh/generated/meshtastic/mesh.pb.h"
 
 // this file defines constants which come from mesh.options
 
@@ -11,8 +11,8 @@
 #define member_size(type, member) sizeof(((type *)0)->member)
 
 /// max number of packets which can be waiting for delivery to android - note, this value comes from mesh.options protobuf
-// FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
-// #define MAX_RX_TOPHONE (member_size(DeviceState, receive_queue) / member_size(DeviceState, receive_queue[0]))
+// FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in
+// RAM #define MAX_RX_TOPHONE (member_size(DeviceState, receive_queue) / member_size(DeviceState, receive_queue[0]))
 #define MAX_RX_TOPHONE 32
 
 /// max number of nodes allowed in the mesh
@@ -36,7 +36,7 @@ bool writecb(pb_ostream_t *stream, const uint8_t *buf, size_t count);
 
 /** is_in_repeated is a macro/function that returns true if a specified word appears in a repeated protobuf array.
  * It relies on the following naming conventions from nanopb:
- * 
+ *
  * pb_size_t ignore_incoming_count;
  * uint32_t ignore_incoming[3];
  */
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 6e85a8c71..5e1550893 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -2,8 +2,8 @@
 #if HAS_SCREEN
 #include "CannedMessageModule.h"
 #include "FSCommon.h"
-#include "NodeDB.h"
 #include "MeshService.h"
+#include "NodeDB.h"
 #include "PowerFSM.h" // neede for button bypass
 #include "mesh/generated/meshtastic/cannedmessages.pb.h"
 
@@ -149,10 +149,10 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
         this->lastTouchMillis = 0;
         validEvent = true;
     }
-    if ((event->inputEvent == static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_BACK)) || 
+    if ((event->inputEvent == static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_BACK)) ||
         (event->inputEvent == static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) ||
         (event->inputEvent == static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))) {
-        LOG_DEBUG("Canned message event (%x)\n",event->kbchar);
+        LOG_DEBUG("Canned message event (%x)\n", event->kbchar);
         if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
             // pass the pressed key
             this->payload = event->kbchar;
@@ -163,7 +163,8 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
     if (event->inputEvent == static_cast<char>(ANYKEY)) {
         LOG_DEBUG("Canned message event any key pressed\n");
         // when inactive, this will switch to the freetext mode
-        if ((this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED)) {
+        if ((this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) ||
+            (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED)) {
             this->runState = CANNED_MESSAGE_RUN_STATE_FREETEXT;
         }
         // pass the pressed key
@@ -176,7 +177,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
         // this will send the text immediately on matrix press
         this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
         this->payload = MATRIXKEY;
-        this->currentMessageIndex = event->kbchar -1;
+        this->currentMessageIndex = event->kbchar - 1;
         this->lastTouchMillis = millis();
         validEvent = true;
     }
@@ -224,7 +225,8 @@ int32_t CannedMessageModule::runOnce()
         this->cursor = 0;
         this->destSelect = false;
         this->notifyObservers(&e);
-    } else if (((this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT)) && ((millis() - this->lastTouchMillis) > INACTIVATE_AFTER_MS)) {
+    } else if (((this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT)) &&
+               ((millis() - this->lastTouchMillis) > INACTIVATE_AFTER_MS)) {
         // Reset module
         LOG_DEBUG("Reset due to lack of activity.\n");
         e.frameChanged = true;
@@ -245,7 +247,7 @@ int32_t CannedMessageModule::runOnce()
             }
         } else {
             if ((this->messagesCount > this->currentMessageIndex) && (strlen(this->messages[this->currentMessageIndex]) > 0)) {
-                if(strcmp (this->messages[this->currentMessageIndex], "~") == 0) {
+                if (strcmp(this->messages[this->currentMessageIndex], "~") == 0) {
                     powerFSM.trigger(EVENT_PRESS);
                     return INT32_MAX;
                 } else {
@@ -264,7 +266,7 @@ int32_t CannedMessageModule::runOnce()
         this->destSelect = false;
         this->notifyObservers(&e);
         return 2000;
-     } else if ((this->runState != CANNED_MESSAGE_RUN_STATE_FREETEXT) && (this->currentMessageIndex == -1)) {
+    } else if ((this->runState != CANNED_MESSAGE_RUN_STATE_FREETEXT) && (this->currentMessageIndex == -1)) {
         this->currentMessageIndex = 0;
         LOG_DEBUG("First touch (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
         e.frameChanged = true;
@@ -290,81 +292,81 @@ int32_t CannedMessageModule::runOnce()
     } else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         e.frameChanged = true;
         switch (this->payload) {
-            case 0xb4: // left
-                if (this->destSelect){
-                    size_t numNodes = nodeDB.getNumNodes();
-                    if(this->dest == NODENUM_BROADCAST) {
-                        this->dest = nodeDB.getNodeNum();
-                    }
-                    for (unsigned int i = 0; i < numNodes; i++) {
-                        if (nodeDB.getNodeByIndex(i)->num == this->dest) {
-                            this->dest = (i > 0) ? nodeDB.getNodeByIndex(i-1)->num : nodeDB.getNodeByIndex(numNodes-1)->num;
-                            break;
-                        }
-                    }
-                    if(this->dest == nodeDB.getNodeNum()) {
-                        this->dest = NODENUM_BROADCAST;
-                    }
-                }else{
-                    if (this->cursor > 0) {
-                        this->cursor--;
+        case 0xb4: // left
+            if (this->destSelect) {
+                size_t numNodes = nodeDB.getNumNodes();
+                if (this->dest == NODENUM_BROADCAST) {
+                    this->dest = nodeDB.getNodeNum();
+                }
+                for (unsigned int i = 0; i < numNodes; i++) {
+                    if (nodeDB.getNodeByIndex(i)->num == this->dest) {
+                        this->dest = (i > 0) ? nodeDB.getNodeByIndex(i - 1)->num : nodeDB.getNodeByIndex(numNodes - 1)->num;
+                        break;
                     }
                 }
-                break;
-            case 0xb7: // right
-                if (this->destSelect){
-                    size_t numNodes = nodeDB.getNumNodes();
-                    if(this->dest == NODENUM_BROADCAST) {
-                        this->dest = nodeDB.getNodeNum();
-                    }
-                    for (unsigned int i = 0; i < numNodes; i++) {
-                        if (nodeDB.getNodeByIndex(i)->num == this->dest) {
-                            this->dest = (i < numNodes-1) ? nodeDB.getNodeByIndex(i+1)->num : nodeDB.getNodeByIndex(0)->num;
-                            break;
-                        }
-                    }
-                    if(this->dest == nodeDB.getNodeNum()) {
-                        this->dest = NODENUM_BROADCAST;
-                    }
-                }else{
-                    if (this->cursor < this->freetext.length()) {
-                        this->cursor++;
-                    }
+                if (this->dest == nodeDB.getNodeNum()) {
+                    this->dest = NODENUM_BROADCAST;
                 }
-                break;
-            case 0x08: // backspace
-                if (this->freetext.length() > 0) {
-                    if(this->cursor == this->freetext.length()) {
-                        this->freetext = this->freetext.substring(0, this->freetext.length() - 1);
-                    } else {
-                        this->freetext = this->freetext.substring(0, this->cursor - 1) + this->freetext.substring(this->cursor, this->freetext.length());
-                    }
+            } else {
+                if (this->cursor > 0) {
                     this->cursor--;
                 }
-                break;
-            case 0x09: // tab
-                if(this->destSelect) {
-                    this->destSelect = false;
+            }
+            break;
+        case 0xb7: // right
+            if (this->destSelect) {
+                size_t numNodes = nodeDB.getNumNodes();
+                if (this->dest == NODENUM_BROADCAST) {
+                    this->dest = nodeDB.getNodeNum();
+                }
+                for (unsigned int i = 0; i < numNodes; i++) {
+                    if (nodeDB.getNodeByIndex(i)->num == this->dest) {
+                        this->dest = (i < numNodes - 1) ? nodeDB.getNodeByIndex(i + 1)->num : nodeDB.getNodeByIndex(0)->num;
+                        break;
+                    }
+                }
+                if (this->dest == nodeDB.getNodeNum()) {
+                    this->dest = NODENUM_BROADCAST;
+                }
+            } else {
+                if (this->cursor < this->freetext.length()) {
+                    this->cursor++;
+                }
+            }
+            break;
+        case 0x08: // backspace
+            if (this->freetext.length() > 0) {
+                if (this->cursor == this->freetext.length()) {
+                    this->freetext = this->freetext.substring(0, this->freetext.length() - 1);
                 } else {
-                    this->destSelect = true;
+                    this->freetext = this->freetext.substring(0, this->cursor - 1) +
+                                     this->freetext.substring(this->cursor, this->freetext.length());
                 }
-                break;
-            default:
-                if(this->cursor == this->freetext.length()) {
-                    this->freetext += this->payload;
-                } else {
-                    this->freetext = this->freetext.substring(0, this->cursor)
-                    + this->payload
-                    + this->freetext.substring(this->cursor);
-                }
-                this->cursor += 1;
-                if (this->freetext.length() > Constants_DATA_PAYLOAD_LEN) {
-                    this->cursor = Constants_DATA_PAYLOAD_LEN;
-                    this->freetext = this->freetext.substring(0, Constants_DATA_PAYLOAD_LEN);
-                }
-                break;
+                this->cursor--;
+            }
+            break;
+        case 0x09: // tab
+            if (this->destSelect) {
+                this->destSelect = false;
+            } else {
+                this->destSelect = true;
+            }
+            break;
+        default:
+            if (this->cursor == this->freetext.length()) {
+                this->freetext += this->payload;
+            } else {
+                this->freetext =
+                    this->freetext.substring(0, this->cursor) + this->payload + this->freetext.substring(this->cursor);
+            }
+            this->cursor += 1;
+            if (this->freetext.length() > Constants_DATA_PAYLOAD_LEN) {
+                this->cursor = Constants_DATA_PAYLOAD_LEN;
+                this->freetext = this->freetext.substring(0, Constants_DATA_PAYLOAD_LEN);
+            }
+            break;
         }
-        
+
         this->lastTouchMillis = millis();
         this->notifyObservers(&e);
         return INACTIVATE_AFTER_MS;
@@ -376,7 +378,7 @@ int32_t CannedMessageModule::runOnce()
         return INACTIVATE_AFTER_MS;
     }
 
-    return INT32_MAX; 
+    return INT32_MAX;
 }
 
 const char *CannedMessageModule::getCurrentMessage()
@@ -391,14 +393,15 @@ const char *CannedMessageModule::getNextMessage()
 {
     return this->messages[this->getNextIndex()];
 }
-const char* CannedMessageModule::getNodeName(NodeNum node) {
-    if (node == NODENUM_BROADCAST){
+const char *CannedMessageModule::getNodeName(NodeNum node)
+{
+    if (node == NODENUM_BROADCAST) {
         return "Broadcast";
-    }else{
+    } else {
         NodeInfo *info = nodeDB.getNode(node);
-        if(info != NULL) {
+        if (info != NULL) {
             return info->user.long_name;
-        }else{
+        } else {
             return "Unknown";
         }
     }
@@ -444,7 +447,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
         display->setTextAlignment(TEXT_ALIGN_LEFT);
         display->setFont(FONT_SMALL);
         display->drawString(10 + x, 0 + y + FONT_HEIGHT_SMALL, "Canned Message\nModule disabled.");
-    }else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
+    } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         display->setTextAlignment(TEXT_ALIGN_LEFT);
         display->setFont(FONT_SMALL);
         if (this->destSelect) {
@@ -460,7 +463,9 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
             display->drawString(x + display->getWidth() - display->getStringWidth(buffer) - 1, y + 0, buffer);
         }
         display->setColor(WHITE);
-        display->drawStringMaxWidth(0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(), cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor));
+        display->drawStringMaxWidth(
+            0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(),
+            cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor));
     } else {
         if (this->messagesCount > 0) {
             display->setTextAlignment(TEXT_ALIGN_LEFT);
@@ -479,7 +484,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
 void CannedMessageModule::loadProtoForModule()
 {
     if (!nodeDB.loadProto(cannedMessagesConfigFile, CannedMessageModuleConfig_size, sizeof(CannedMessageModuleConfig),
-                   &CannedMessageModuleConfig_msg, &cannedMessageModuleConfig)) {
+                          &CannedMessageModuleConfig_msg, &cannedMessageModuleConfig)) {
         installDefaultCannedMessageModuleConfig();
     }
 }
@@ -498,8 +503,8 @@ bool CannedMessageModule::saveProtoForModule()
     FS.mkdir("/prefs");
 #endif
 
-    okay &= nodeDB.saveProto(cannedMessagesConfigFile, CannedMessageModuleConfig_size,
-        &CannedMessageModuleConfig_msg, &cannedMessageModuleConfig);
+    okay &= nodeDB.saveProto(cannedMessagesConfigFile, CannedMessageModuleConfig_size, &CannedMessageModuleConfig_msg,
+                             &cannedMessageModuleConfig);
 
     return okay;
 }
@@ -549,13 +554,13 @@ AdminMessageHandleResult CannedMessageModule::handleAdminMessageForModule(const
 void CannedMessageModule::handleGetCannedMessageModuleMessages(const MeshPacket &req, AdminMessage *response)
 {
     LOG_DEBUG("*** handleGetCannedMessageModuleMessages\n");
-    if(req.decoded.want_response) {
+    if (req.decoded.want_response) {
         response->which_payload_variant = AdminMessage_get_canned_message_module_messages_response_tag;
-        strncpy(response->get_canned_message_module_messages_response, cannedMessageModuleConfig.messages, sizeof(response->get_canned_message_module_messages_response));
+        strncpy(response->get_canned_message_module_messages_response, cannedMessageModuleConfig.messages,
+                sizeof(response->get_canned_message_module_messages_response));
     } // Don't send anything if not instructed to. Better than asserting.
 }
 
-
 void CannedMessageModule::handleSetCannedMessageModuleMessages(const char *from_msg)
 {
     int changed = 0;
@@ -573,9 +578,7 @@ void CannedMessageModule::handleSetCannedMessageModuleMessages(const char *from_
 
 String CannedMessageModule::drawWithCursor(String text, int cursor)
 {
-    String result = text.substring(0, cursor)
-    + "_" 
-    + text.substring(cursor);
+    String result = text.substring(0, cursor) + "_" + text.substring(cursor);
     return result;
 }
 
diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp
index 05776bd44..1e379b65c 100644
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -58,19 +58,19 @@ int32_t ExternalNotificationModule::runOnce()
 
         // If the output is turned on, turn it back off after the given period of time.
         if (isNagging) {
-            if (externalTurnedOn[0] + (moduleConfig.external_notification.output_ms
-                                    ? moduleConfig.external_notification.output_ms
-                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) < millis()) {
+            if (externalTurnedOn[0] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
+                                                                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
+                millis()) {
                 getExternal(0) ? setExternalOff(0) : setExternalOn(0);
             }
-            if (externalTurnedOn[1] + (moduleConfig.external_notification.output_ms
-                                    ? moduleConfig.external_notification.output_ms
-                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) < millis()) {
+            if (externalTurnedOn[1] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
+                                                                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
+                millis()) {
                 getExternal(1) ? setExternalOff(1) : setExternalOn(1);
             }
-            if (externalTurnedOn[2] + (moduleConfig.external_notification.output_ms
-                                    ? moduleConfig.external_notification.output_ms
-                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) < millis()) {
+            if (externalTurnedOn[2] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
+                                                                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
+                millis()) {
                 getExternal(2) ? setExternalOff(2) : setExternalOn(2);
             }
         }
@@ -93,18 +93,18 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)
     externalCurrentState[index] = 1;
     externalTurnedOn[index] = millis();
 
-    switch(index) {
-        case 1:
-            if(moduleConfig.external_notification.output_vibra)
-                digitalWrite(moduleConfig.external_notification.output_vibra, true);
-            break;
-        case 2:
-            if(moduleConfig.external_notification.output_buzzer)
-                digitalWrite(moduleConfig.external_notification.output_buzzer, true);
-            break;
-        default:
-            digitalWrite(output, (moduleConfig.external_notification.active ? true : false));
-            break;
+    switch (index) {
+    case 1:
+        if (moduleConfig.external_notification.output_vibra)
+            digitalWrite(moduleConfig.external_notification.output_vibra, true);
+        break;
+    case 2:
+        if (moduleConfig.external_notification.output_buzzer)
+            digitalWrite(moduleConfig.external_notification.output_buzzer, true);
+        break;
+    default:
+        digitalWrite(output, (moduleConfig.external_notification.active ? true : false));
+        break;
     }
 }
 
@@ -113,18 +113,18 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)
     externalCurrentState[index] = 0;
     externalTurnedOn[index] = millis();
 
-    switch(index) {
-        case 1:
-            if(moduleConfig.external_notification.output_vibra)
-                digitalWrite(moduleConfig.external_notification.output_vibra, false);
-            break;
-        case 2:
-            if(moduleConfig.external_notification.output_buzzer)
-                digitalWrite(moduleConfig.external_notification.output_buzzer, false);
-            break;
-        default:
-            digitalWrite(output, (moduleConfig.external_notification.active ? false : true));
-            break;
+    switch (index) {
+    case 1:
+        if (moduleConfig.external_notification.output_vibra)
+            digitalWrite(moduleConfig.external_notification.output_vibra, false);
+        break;
+    case 2:
+        if (moduleConfig.external_notification.output_buzzer)
+            digitalWrite(moduleConfig.external_notification.output_buzzer, false);
+        break;
+    default:
+        digitalWrite(output, (moduleConfig.external_notification.active ? false : true));
+        break;
     }
 }
 
@@ -133,7 +133,8 @@ bool ExternalNotificationModule::getExternal(uint8_t index)
     return externalCurrentState[index];
 }
 
-void ExternalNotificationModule::stopNow() {
+void ExternalNotificationModule::stopNow()
+{
     rtttl::stop();
     nagCycleCutoff = 1; // small value
     isNagging = false;
@@ -161,40 +162,39 @@ ExternalNotificationModule::ExternalNotificationModule()
     // moduleConfig.external_notification.output_buzzer = 10; // RAK4631 IO6
     // moduleConfig.external_notification.output_vibra = 28; // RAK4631 IO7
     // moduleConfig.external_notification.nag_timeout = 300;
-    
+
     if (moduleConfig.external_notification.enabled) {
         if (!nodeDB.loadProto(rtttlConfigFile, RTTTLConfig_size, sizeof(RTTTLConfig), &RTTTLConfig_msg, &rtttlConfig)) {
             memset(rtttlConfig.ringtone, 0, sizeof(rtttlConfig.ringtone));
-            strncpy(rtttlConfig.ringtone, "a:d=8,o=5,b=125:4d#6,a#,2d#6,16p,g#,4a#,4d#.,p,16g,16a#,d#6,a#,f6,2d#6,16p,c#.6,16c6,16a#,g#.,2a#", sizeof(rtttlConfig.ringtone));
+            strncpy(rtttlConfig.ringtone,
+                    "a:d=8,o=5,b=125:4d#6,a#,2d#6,16p,g#,4a#,4d#.,p,16g,16a#,d#6,a#,f6,2d#6,16p,c#.6,16c6,16a#,g#.,2a#",
+                    sizeof(rtttlConfig.ringtone));
         }
 
         LOG_INFO("Initializing External Notification Module\n");
 
-        output = moduleConfig.external_notification.output
-                        ? moduleConfig.external_notification.output
-                        : EXT_NOTIFICATION_MODULE_OUTPUT;
+        output = moduleConfig.external_notification.output ? moduleConfig.external_notification.output
+                                                           : EXT_NOTIFICATION_MODULE_OUTPUT;
 
         // Set the direction of a pin
         LOG_INFO("Using Pin %i in digital mode\n", output);
         pinMode(output, OUTPUT);
         setExternalOff(0);
         externalTurnedOn[0] = 0;
-        if(moduleConfig.external_notification.output_vibra) {
+        if (moduleConfig.external_notification.output_vibra) {
             LOG_INFO("Using Pin %i for vibra motor\n", moduleConfig.external_notification.output_vibra);
             pinMode(moduleConfig.external_notification.output_vibra, OUTPUT);
             setExternalOff(1);
             externalTurnedOn[1] = 0;
         }
-        if(moduleConfig.external_notification.output_buzzer) {
+        if (moduleConfig.external_notification.output_buzzer) {
             if (!moduleConfig.external_notification.use_pwm) {
                 LOG_INFO("Using Pin %i for buzzer\n", moduleConfig.external_notification.output_buzzer);
                 pinMode(moduleConfig.external_notification.output_buzzer, OUTPUT);
                 setExternalOff(2);
                 externalTurnedOn[2] = 0;
             } else {
-                config.device.buzzer_gpio = config.device.buzzer_gpio
-                    ? config.device.buzzer_gpio
-                    : PIN_BUZZER;
+                config.device.buzzer_gpio = config.device.buzzer_gpio ? config.device.buzzer_gpio : PIN_BUZZER;
                 // in PWM Mode we force the buzzer pin if it is set
                 LOG_INFO("Using Pin %i in PWM mode\n", config.device.buzzer_gpio);
             }
@@ -274,7 +274,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                 }
             }
 
-            
             if (moduleConfig.external_notification.alert_message_vibra) {
                 LOG_INFO("externalNotificationModule - Notification Module (Vibra)\n");
                 isNagging = true;
@@ -300,7 +299,7 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                     nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
                 }
             }
-            
+
             setIntervalFromNow(0); // run once so we know if we should do something
         }
 
@@ -320,7 +319,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
  * @return AdminMessageHandleResult HANDLED if message was handled
  *   HANDLED_WITH_RESULT if a result is also prepared.
  */
-AdminMessageHandleResult ExternalNotificationModule::handleAdminMessageForModule(const MeshPacket &mp, AdminMessage *request, AdminMessage *response)
+AdminMessageHandleResult ExternalNotificationModule::handleAdminMessageForModule(const MeshPacket &mp, AdminMessage *request,
+                                                                                 AdminMessage *response)
 {
     AdminMessageHandleResult result;
 
@@ -347,13 +347,12 @@ AdminMessageHandleResult ExternalNotificationModule::handleAdminMessageForModule
 void ExternalNotificationModule::handleGetRingtone(const MeshPacket &req, AdminMessage *response)
 {
     LOG_INFO("*** handleGetRingtone\n");
-    if(req.decoded.want_response) {
+    if (req.decoded.want_response) {
         response->which_payload_variant = AdminMessage_get_ringtone_response_tag;
         strncpy(response->get_ringtone_response, rtttlConfig.ringtone, sizeof(response->get_ringtone_response));
     } // Don't send anything if not instructed to. Better than asserting.
 }
 
-
 void ExternalNotificationModule::handleSetRingtone(const char *from_msg)
 {
     int changed = 0;
diff --git a/src/modules/RemoteHardwareModule.h b/src/modules/RemoteHardwareModule.h
index 2e16d356d..69733a87d 100644
--- a/src/modules/RemoteHardwareModule.h
+++ b/src/modules/RemoteHardwareModule.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "ProtobufModule.h"
-#include "mesh/generated/meshtastic/remote_hardware.pb.h"
 #include "concurrency/OSThread.h"
+#include "mesh/generated/meshtastic/remote_hardware.pb.h"
 
 /**
  * A module that provides easy low-level remote access to device hardware.
@@ -9,13 +9,14 @@
 class RemoteHardwareModule : public ProtobufModule<HardwareMessage>, private concurrency::OSThread
 {
     /// The current set of GPIOs we've been asked to watch for changes
-    uint64_t watchGpios = 0; 
+    uint64_t watchGpios = 0;
 
     /// The previously read value of watched pins
     uint64_t previousWatch = 0;
 
     /// The timestamp of our last watch event (we throttle watches to 1 change every 30 seconds)
     uint32_t lastWatchMsec = 0;
+
   public:
     /** Constructor
      * name is for debugging output
@@ -32,7 +33,7 @@ class RemoteHardwareModule : public ProtobufModule<HardwareMessage>, private con
     /**
      * Periodically read the gpios we have been asked to WATCH, if they have changed,
      * broadcast a message with the change information.
-     * 
+     *
      * The method that will be called each time our thread gets a chance to run
      *
      * Returns desired period for next invocation (or RUN_SAME for no change)
diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp
index 1ae28fab3..3821ea445 100644
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -9,13 +9,12 @@
 #include "main.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
-#include "MeshService.h"
 
 int32_t DeviceTelemetryModule::runOnce()
 {
     uint32_t now = millis();
-    if ((lastSentToMesh == 0 || 
-        (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.device_update_interval)) &&
+    if ((lastSentToMesh == 0 ||
+         (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.device_update_interval)) &&
         airTime->isTxAllowedChannelUtil() && airTime->isTxAllowedAirUtil()) {
         sendTelemetry();
         lastSentToMesh = now;
@@ -31,13 +30,10 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemet
 {
     if (t->which_variant == Telemetry_device_metrics_tag) {
         const char *sender = getSenderShortName(mp);
-    
-        LOG_INFO("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n",
-            sender,
-            t->variant.device_metrics.air_util_tx,
-            t->variant.device_metrics.channel_utilization,
-            t->variant.device_metrics.battery_level,
-            t->variant.device_metrics.voltage);
+
+        LOG_INFO("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", sender,
+                 t->variant.device_metrics.air_util_tx, t->variant.device_metrics.channel_utilization,
+                 t->variant.device_metrics.battery_level, t->variant.device_metrics.voltage);
 
         lastMeasurementPacket = packetPool.allocCopy(mp);
 
@@ -58,11 +54,9 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
     t.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization;
     t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
 
-    LOG_INFO("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", 
-        t.variant.device_metrics.air_util_tx,
-        t.variant.device_metrics.channel_utilization,
-        t.variant.device_metrics.battery_level,
-        t.variant.device_metrics.voltage);
+    LOG_INFO("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n",
+             t.variant.device_metrics.air_util_tx, t.variant.device_metrics.channel_utilization,
+             t.variant.device_metrics.battery_level, t.variant.device_metrics.voltage);
 
     MeshPacket *p = allocDataProtobuf(t);
     p->to = dest;
diff --git a/src/modules/Telemetry/DeviceTelemetry.h b/src/modules/Telemetry/DeviceTelemetry.h
index 199d00307..11506c71f 100644
--- a/src/modules/Telemetry/DeviceTelemetry.h
+++ b/src/modules/Telemetry/DeviceTelemetry.h
@@ -11,8 +11,8 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
     DeviceTelemetryModule()
         : concurrency::OSThread("DeviceTelemetryModule"), ProtobufModule("DeviceTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
     {
-      lastMeasurementPacket = nullptr;
-      setIntervalFromNow(10 * 1000);
+        lastMeasurementPacket = nullptr;
+        setIntervalFromNow(10 * 1000);
     }
     virtual bool wantUIFrame() { return false; }
 
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index cc5f56310..dce243b83 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -9,18 +9,17 @@
 #include "main.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
-#include "MeshService.h"
 
 // Sensors
-#include "Sensor/BMP280Sensor.h"
 #include "Sensor/BME280Sensor.h"
 #include "Sensor/BME680Sensor.h"
-#include "Sensor/MCP9808Sensor.h"
-#include "Sensor/INA260Sensor.h"
+#include "Sensor/BMP280Sensor.h"
 #include "Sensor/INA219Sensor.h"
-#include "Sensor/SHTC3Sensor.h"
+#include "Sensor/INA260Sensor.h"
 #include "Sensor/LPS22HBSensor.h"
+#include "Sensor/MCP9808Sensor.h"
 #include "Sensor/SHT31Sensor.h"
+#include "Sensor/SHTC3Sensor.h"
 
 BMP280Sensor bmp280Sensor;
 BME280Sensor bme280Sensor;
@@ -59,13 +58,12 @@ int32_t EnvironmentTelemetryModule::runOnce()
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
     */
-   
+
     // moduleConfig.telemetry.environment_measurement_enabled = 1;
     // moduleConfig.telemetry.environment_screen_enabled = 1;
     // moduleConfig.telemetry.environment_update_interval = 45;
 
-    if (!(moduleConfig.telemetry.environment_measurement_enabled ||
-          moduleConfig.telemetry.environment_screen_enabled)) {
+    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled)) {
         // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
         return disable();
     }
@@ -78,15 +76,15 @@ int32_t EnvironmentTelemetryModule::runOnce()
             LOG_INFO("Environment Telemetry: Initializing\n");
             // it's possible to have this module enabled, only for displaying values on the screen.
             // therefore, we should only enable the sensor loop if measurement is also enabled
-            if (bmp280Sensor.hasSensor()) 
+            if (bmp280Sensor.hasSensor())
                 result = bmp280Sensor.runOnce();
-            if (bme280Sensor.hasSensor()) 
+            if (bme280Sensor.hasSensor())
                 result = bme280Sensor.runOnce();
-            if (bme680Sensor.hasSensor()) 
+            if (bme680Sensor.hasSensor())
                 result = bme680Sensor.runOnce();
-            if (mcp9808Sensor.hasSensor()) 
+            if (mcp9808Sensor.hasSensor())
                 result = mcp9808Sensor.runOnce();
-            if (ina260Sensor.hasSensor()) 
+            if (ina260Sensor.hasSensor())
                 result = ina260Sensor.runOnce();
             if (ina219Sensor.hasSensor())
                 result = ina219Sensor.runOnce();
@@ -105,8 +103,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
             return result;
 
         uint32_t now = millis();
-        if ((lastSentToMesh == 0 || 
-            (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval)) && 
+        if ((lastSentToMesh == 0 ||
+             (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval)) &&
             airTime->isTxAllowedAirUtil()) {
             sendTelemetry();
             lastSentToMesh = now;
@@ -173,13 +171,15 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
     }
     display->drawString(x, y += fontHeight(FONT_MEDIUM) - 2, "From: " + String(lastSender) + "(" + String(agoSecs) + "s)");
     display->drawString(x, y += fontHeight(FONT_SMALL) - 2,
-        "Temp/Hum: " + last_temp + " / " + String(lastMeasurement.variant.environment_metrics.relative_humidity, 0) + "%");
+                        "Temp/Hum: " + last_temp + " / " +
+                            String(lastMeasurement.variant.environment_metrics.relative_humidity, 0) + "%");
     if (lastMeasurement.variant.environment_metrics.barometric_pressure != 0)
         display->drawString(x, y += fontHeight(FONT_SMALL),
-            "Press: " + String(lastMeasurement.variant.environment_metrics.barometric_pressure, 0) + "hPA");
+                            "Press: " + String(lastMeasurement.variant.environment_metrics.barometric_pressure, 0) + "hPA");
     if (lastMeasurement.variant.environment_metrics.voltage != 0)
         display->drawString(x, y += fontHeight(FONT_SMALL),
-            "Volt/Cur: " + String(lastMeasurement.variant.environment_metrics.voltage, 0) + "V / " + String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
+                            "Volt/Cur: " + String(lastMeasurement.variant.environment_metrics.voltage, 0) + "V / " +
+                                String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
 }
 
 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemetry *t)
@@ -187,14 +187,11 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Te
     if (t->which_variant == Telemetry_environment_metrics_tag) {
         const char *sender = getSenderShortName(mp);
 
-        LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
-            sender,
-            t->variant.environment_metrics.barometric_pressure,
-            t->variant.environment_metrics.current,
-            t->variant.environment_metrics.gas_resistance,
-            t->variant.environment_metrics.relative_humidity,
-            t->variant.environment_metrics.temperature,
-            t->variant.environment_metrics.voltage);
+        LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, "
+                 "temperature=%f, voltage=%f\n",
+                 sender, t->variant.environment_metrics.barometric_pressure, t->variant.environment_metrics.current,
+                 t->variant.environment_metrics.gas_resistance, t->variant.environment_metrics.relative_humidity,
+                 t->variant.environment_metrics.temperature, t->variant.environment_metrics.voltage);
 
         lastMeasurementPacket = packetPool.allocCopy(mp);
     }
@@ -234,13 +231,11 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
     if (ina260Sensor.hasSensor())
         ina260Sensor.getMetrics(&m);
 
-   LOG_INFO("(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
-        m.variant.environment_metrics.barometric_pressure,
-        m.variant.environment_metrics.current,
-        m.variant.environment_metrics.gas_resistance,
-        m.variant.environment_metrics.relative_humidity,
-        m.variant.environment_metrics.temperature,
-        m.variant.environment_metrics.voltage);
+    LOG_INFO(
+        "(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
+        m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current,
+        m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity,
+        m.variant.environment_metrics.temperature, m.variant.environment_metrics.voltage);
 
     sensor_read_error_count = 0;
 
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.h b/src/modules/Telemetry/EnvironmentTelemetry.h
index 06621363f..5dce19c57 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.h
+++ b/src/modules/Telemetry/EnvironmentTelemetry.h
@@ -12,8 +12,8 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
         : concurrency::OSThread("EnvironmentTelemetryModule"),
           ProtobufModule("EnvironmentTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
     {
-      lastMeasurementPacket = nullptr;
-      setIntervalFromNow(10 * 1000);
+        lastMeasurementPacket = nullptr;
+        setIntervalFromNow(10 * 1000);
     }
     virtual bool wantUIFrame() override;
 #if !HAS_SCREEN
diff --git a/src/modules/Telemetry/Sensor/BME280Sensor.cpp b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
index 93d882238..6c173eaec 100644
--- a/src/modules/Telemetry/Sensor/BME280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
@@ -1,35 +1,33 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "BME280Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_BME280.h>
 #include <typeinfo>
 
-BME280Sensor::BME280Sensor() : 
-    TelemetrySensor(TelemetrySensorType_BME280, "BME280")
-{
-}
+BME280Sensor::BME280Sensor() : TelemetrySensor(TelemetrySensorType_BME280, "BME280") {}
 
-int32_t BME280Sensor::runOnce() {
+int32_t BME280Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bme280.begin(nodeTelemetrySensorsMap[sensorType]); 
-    
-    bme280.setSampling( Adafruit_BME280::MODE_FORCED,
-                        Adafruit_BME280::SAMPLING_X1, // Temp. oversampling
-                        Adafruit_BME280::SAMPLING_X1, // Pressure oversampling
-                        Adafruit_BME280::SAMPLING_X1, // Humidity oversampling
-                        Adafruit_BME280::FILTER_OFF,
-                        Adafruit_BME280::STANDBY_MS_1000);
-    
+    status = bme280.begin(nodeTelemetrySensorsMap[sensorType]);
+
+    bme280.setSampling(Adafruit_BME280::MODE_FORCED,
+                       Adafruit_BME280::SAMPLING_X1, // Temp. oversampling
+                       Adafruit_BME280::SAMPLING_X1, // Pressure oversampling
+                       Adafruit_BME280::SAMPLING_X1, // Humidity oversampling
+                       Adafruit_BME280::FILTER_OFF, Adafruit_BME280::STANDBY_MS_1000);
+
     return initI2CSensor();
 }
 
-void BME280Sensor::setup() { }
+void BME280Sensor::setup() {}
 
-bool BME280Sensor::getMetrics(Telemetry *measurement) {
+bool BME280Sensor::getMetrics(Telemetry *measurement)
+{
     LOG_DEBUG("BME280Sensor::getMetrics\n");
     bme280.takeForcedMeasurement();
     measurement->variant.environment_metrics.temperature = bme280.readTemperature();
@@ -37,4 +35,4 @@ bool BME280Sensor::getMetrics(Telemetry *measurement) {
     measurement->variant.environment_metrics.barometric_pressure = bme280.readPressure() / 100.0F;
 
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/BME280Sensor.h b/src/modules/Telemetry/Sensor/BME280Sensor.h
index 606372707..c75b9ef59 100644
--- a/src/modules/Telemetry/Sensor/BME280Sensor.h
+++ b/src/modules/Telemetry/Sensor/BME280Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
 
-class BME280Sensor : virtual public TelemetrySensor {
-private:
+class BME280Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_BME280 bme280;
 
-protected:
+  protected:
     virtual void setup() override;
 
-public:
+  public:
     BME280Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
index e164ec28a..e3266450a 100644
--- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
@@ -1,15 +1,13 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "BME680Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_BME680.h>
 
-BME680Sensor::BME680Sensor() : 
-    TelemetrySensor(TelemetrySensorType_BME680, "BME680") 
-{
-}
+BME680Sensor::BME680Sensor() : TelemetrySensor(TelemetrySensorType_BME680, "BME680") {}
 
-int32_t BME680Sensor::runOnce() {
+int32_t BME680Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
@@ -19,9 +17,10 @@ int32_t BME680Sensor::runOnce() {
     return initI2CSensor();
 }
 
-void BME680Sensor::setup() { }
+void BME680Sensor::setup() {}
 
-bool BME680Sensor::getMetrics(Telemetry *measurement) {
+bool BME680Sensor::getMetrics(Telemetry *measurement)
+{
     bme680.performReading();
     measurement->variant.environment_metrics.temperature = bme680.temperature;
     measurement->variant.environment_metrics.relative_humidity = bme680.humidity;
@@ -29,4 +28,4 @@ bool BME680Sensor::getMetrics(Telemetry *measurement) {
     measurement->variant.environment_metrics.gas_resistance = bme680.gas_resistance / 1000.0;
 
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.h b/src/modules/Telemetry/Sensor/BME680Sensor.h
index 146730d2c..e66eba75c 100644
--- a/src/modules/Telemetry/Sensor/BME680Sensor.h
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_BME680.h>
 
-class BME680Sensor : virtual public TelemetrySensor {
-private:
+class BME680Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_BME680 bme680;
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     BME680Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
index 1f3f3a835..267656c4c 100644
--- a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
@@ -1,38 +1,36 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "BMP280Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_BMP280.h>
 #include <typeinfo>
 
-BMP280Sensor::BMP280Sensor() : 
-    TelemetrySensor(TelemetrySensorType_BMP280, "BMP280")
-{
-}
+BMP280Sensor::BMP280Sensor() : TelemetrySensor(TelemetrySensorType_BMP280, "BMP280") {}
 
-int32_t BMP280Sensor::runOnce() {
+int32_t BMP280Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bmp280.begin(nodeTelemetrySensorsMap[sensorType]); 
+    status = bmp280.begin(nodeTelemetrySensorsMap[sensorType]);
 
-    bmp280.setSampling( Adafruit_BMP280::MODE_FORCED,
-                        Adafruit_BMP280::SAMPLING_X1, // Temp. oversampling
-                        Adafruit_BMP280::SAMPLING_X1, // Pressure oversampling
-                        Adafruit_BMP280::FILTER_OFF,
-                        Adafruit_BMP280::STANDBY_MS_1000);
+    bmp280.setSampling(Adafruit_BMP280::MODE_FORCED,
+                       Adafruit_BMP280::SAMPLING_X1, // Temp. oversampling
+                       Adafruit_BMP280::SAMPLING_X1, // Pressure oversampling
+                       Adafruit_BMP280::FILTER_OFF, Adafruit_BMP280::STANDBY_MS_1000);
 
     return initI2CSensor();
 }
 
-void BMP280Sensor::setup() { }
+void BMP280Sensor::setup() {}
 
-bool BMP280Sensor::getMetrics(Telemetry *measurement) {
+bool BMP280Sensor::getMetrics(Telemetry *measurement)
+{
     LOG_DEBUG("BMP280Sensor::getMetrics\n");
     bmp280.takeForcedMeasurement();
     measurement->variant.environment_metrics.temperature = bmp280.readTemperature();
     measurement->variant.environment_metrics.barometric_pressure = bmp280.readPressure() / 100.0F;
 
     return true;
-}    
+}
diff --git a/src/modules/Telemetry/Sensor/BMP280Sensor.h b/src/modules/Telemetry/Sensor/BMP280Sensor.h
index ce41d2d20..769f4e4ba 100644
--- a/src/modules/Telemetry/Sensor/BMP280Sensor.h
+++ b/src/modules/Telemetry/Sensor/BMP280Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
 
-class BMP280Sensor : virtual public TelemetrySensor {
-private:
+class BMP280Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_BMP280 bmp280;
 
-protected:
+  protected:
     virtual void setup() override;
 
-public:
+  public:
     BMP280Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.cpp b/src/modules/Telemetry/Sensor/INA219Sensor.cpp
index bf36f73b5..69a67ad4b 100644
--- a/src/modules/Telemetry/Sensor/INA219Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.cpp
@@ -1,15 +1,13 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "INA219Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_INA219.h>
 
-INA219Sensor::INA219Sensor() : 
-    TelemetrySensor(TelemetrySensorType_INA219, "INA219") 
-{
-}
+INA219Sensor::INA219Sensor() : TelemetrySensor(TelemetrySensorType_INA219, "INA219") {}
 
-int32_t INA219Sensor::runOnce() {
+int32_t INA219Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
@@ -19,12 +17,11 @@ int32_t INA219Sensor::runOnce() {
     return initI2CSensor();
 }
 
-void INA219Sensor::setup() 
-{
-}
+void INA219Sensor::setup() {}
 
-bool INA219Sensor::getMetrics(Telemetry *measurement) {
+bool INA219Sensor::getMetrics(Telemetry *measurement)
+{
     measurement->variant.environment_metrics.voltage = ina219.getBusVoltage_V();
     measurement->variant.environment_metrics.current = ina219.getCurrent_mA();
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.h b/src/modules/Telemetry/Sensor/INA219Sensor.h
index 50ce0edbc..7288dac8a 100644
--- a/src/modules/Telemetry/Sensor/INA219Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.h
@@ -2,16 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_INA219.h>
 
-
-class INA219Sensor : virtual public TelemetrySensor {
-private:
+class INA219Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_INA219 ina219;
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     INA219Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA260Sensor.cpp b/src/modules/Telemetry/Sensor/INA260Sensor.cpp
index d6b53f4a3..d69d25a75 100644
--- a/src/modules/Telemetry/Sensor/INA260Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA260Sensor.cpp
@@ -1,15 +1,13 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "INA260Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_INA260.h>
 
-INA260Sensor::INA260Sensor() : 
-    TelemetrySensor(TelemetrySensorType_INA260, "INA260") 
-{
-}
+INA260Sensor::INA260Sensor() : TelemetrySensor(TelemetrySensorType_INA260, "INA260") {}
 
-int32_t INA260Sensor::runOnce() {
+int32_t INA260Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
@@ -18,13 +16,12 @@ int32_t INA260Sensor::runOnce() {
     return initI2CSensor();
 }
 
-void INA260Sensor::setup() 
-{
-}
+void INA260Sensor::setup() {}
 
-bool INA260Sensor::getMetrics(Telemetry *measurement) {
+bool INA260Sensor::getMetrics(Telemetry *measurement)
+{
     // mV conversion to V
     measurement->variant.environment_metrics.voltage = ina260.readBusVoltage() / 1000;
     measurement->variant.environment_metrics.current = ina260.readCurrent();
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/INA260Sensor.h b/src/modules/Telemetry/Sensor/INA260Sensor.h
index 8d451ddda..de1fe0ad7 100644
--- a/src/modules/Telemetry/Sensor/INA260Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA260Sensor.h
@@ -2,16 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_INA260.h>
 
-
-class INA260Sensor : virtual public TelemetrySensor {
-private:
+class INA260Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_INA260 ina260 = Adafruit_INA260();
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     INA260Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
index 6647b2eac..ac77bdb40 100644
--- a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
+++ b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
@@ -1,16 +1,14 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "LPS22HBSensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>
 
-LPS22HBSensor::LPS22HBSensor() : 
-    TelemetrySensor(TelemetrySensorType_LPS22, "LPS22HB") 
-{
-}
+LPS22HBSensor::LPS22HBSensor() : TelemetrySensor(TelemetrySensorType_LPS22, "LPS22HB") {}
 
-int32_t LPS22HBSensor::runOnce() {
+int32_t LPS22HBSensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
@@ -19,12 +17,13 @@ int32_t LPS22HBSensor::runOnce() {
     return initI2CSensor();
 }
 
-void LPS22HBSensor::setup() 
+void LPS22HBSensor::setup()
 {
     lps22hb.setDataRate(LPS22_RATE_10_HZ);
 }
 
-bool LPS22HBSensor::getMetrics(Telemetry *measurement) {
+bool LPS22HBSensor::getMetrics(Telemetry *measurement)
+{
     sensors_event_t temp;
     sensors_event_t pressure;
     lps22hb.getEvent(&pressure, &temp);
@@ -33,4 +32,4 @@ bool LPS22HBSensor::getMetrics(Telemetry *measurement) {
     measurement->variant.environment_metrics.barometric_pressure = pressure.pressure;
 
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/LPS22HBSensor.h b/src/modules/Telemetry/Sensor/LPS22HBSensor.h
index 2e8593d2b..7472950b8 100644
--- a/src/modules/Telemetry/Sensor/LPS22HBSensor.h
+++ b/src/modules/Telemetry/Sensor/LPS22HBSensor.h
@@ -3,15 +3,16 @@
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>
 
-class LPS22HBSensor : virtual public TelemetrySensor {
-private:
+class LPS22HBSensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_LPS22 lps22hb;
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     LPS22HBSensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
index d8e14922a..7bac18d9a 100644
--- a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
@@ -1,15 +1,13 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "MCP9808Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_MCP9808.h>
 
-MCP9808Sensor::MCP9808Sensor() : 
-    TelemetrySensor(TelemetrySensorType_MCP9808, "MCP9808") 
-{
-}
+MCP9808Sensor::MCP9808Sensor() : TelemetrySensor(TelemetrySensorType_MCP9808, "MCP9808") {}
 
-int32_t MCP9808Sensor::runOnce() {
+int32_t MCP9808Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
@@ -18,12 +16,14 @@ int32_t MCP9808Sensor::runOnce() {
     return initI2CSensor();
 }
 
-void MCP9808Sensor::setup() {
+void MCP9808Sensor::setup()
+{
     mcp9808.setResolution(2);
 }
 
-bool MCP9808Sensor::getMetrics(Telemetry *measurement) {
+bool MCP9808Sensor::getMetrics(Telemetry *measurement)
+{
     LOG_DEBUG("MCP9808Sensor::getMetrics\n");
     measurement->variant.environment_metrics.temperature = mcp9808.readTempC();
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/MCP9808Sensor.h b/src/modules/Telemetry/Sensor/MCP9808Sensor.h
index aa3eadbe6..150b76237 100644
--- a/src/modules/Telemetry/Sensor/MCP9808Sensor.h
+++ b/src/modules/Telemetry/Sensor/MCP9808Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>
 
-class MCP9808Sensor : virtual public TelemetrySensor {
-private:
+class MCP9808Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_MCP9808 mcp9808;
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     MCP9808Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
index 22284d5c0..940a94d46 100644
--- a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
@@ -1,31 +1,30 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "SHT31Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_SHT31.h>
 
-SHT31Sensor::SHT31Sensor() : 
-    TelemetrySensor(TelemetrySensorType_SHT31, "SHT31") 
-{
-}
+SHT31Sensor::SHT31Sensor() : TelemetrySensor(TelemetrySensorType_SHT31, "SHT31") {}
 
-int32_t SHT31Sensor::runOnce() {
+int32_t SHT31Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = sht31.begin(); 
+    status = sht31.begin();
     return initI2CSensor();
 }
 
-void SHT31Sensor::setup() 
+void SHT31Sensor::setup()
 {
     // Set up oversampling and filter initialization
 }
 
-bool SHT31Sensor::getMetrics(Telemetry *measurement) {
+bool SHT31Sensor::getMetrics(Telemetry *measurement)
+{
     measurement->variant.environment_metrics.temperature = sht31.readTemperature();
     measurement->variant.environment_metrics.relative_humidity = sht31.readHumidity();
 
     return true;
-}    
+}
diff --git a/src/modules/Telemetry/Sensor/SHT31Sensor.h b/src/modules/Telemetry/Sensor/SHT31Sensor.h
index 92ea9a05d..ca574a5cd 100644
--- a/src/modules/Telemetry/Sensor/SHT31Sensor.h
+++ b/src/modules/Telemetry/Sensor/SHT31Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>
 
-class SHT31Sensor : virtual public TelemetrySensor {
-private:
+class SHT31Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_SHT31 sht31 = Adafruit_SHT31();
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     SHT31Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
+};
diff --git a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
index 99335d87c..1ed16cc11 100644
--- a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
@@ -1,29 +1,28 @@
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "configuration.h"
-#include "TelemetrySensor.h"
 #include "SHTC3Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
 #include <Adafruit_SHTC3.h>
 
-SHTC3Sensor::SHTC3Sensor() : 
-    TelemetrySensor(TelemetrySensorType_SHTC3, "SHTC3") 
-{
-}
+SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(TelemetrySensorType_SHTC3, "SHTC3") {}
 
-int32_t SHTC3Sensor::runOnce() {
+int32_t SHTC3Sensor::runOnce()
+{
     LOG_INFO("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = shtc3.begin(); 
+    status = shtc3.begin();
     return initI2CSensor();
 }
 
-void SHTC3Sensor::setup() 
+void SHTC3Sensor::setup()
 {
     // Set up oversampling and filter initialization
 }
 
-bool SHTC3Sensor::getMetrics(Telemetry *measurement) {
+bool SHTC3Sensor::getMetrics(Telemetry *measurement)
+{
     sensors_event_t humidity, temp;
     shtc3.getEvent(&humidity, &temp);
 
@@ -31,4 +30,4 @@ bool SHTC3Sensor::getMetrics(Telemetry *measurement) {
     measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
 
     return true;
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/SHTC3Sensor.h b/src/modules/Telemetry/Sensor/SHTC3Sensor.h
index d0cd33f03..f391580a6 100644
--- a/src/modules/Telemetry/Sensor/SHTC3Sensor.h
+++ b/src/modules/Telemetry/Sensor/SHTC3Sensor.h
@@ -2,15 +2,16 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>
 
-class SHTC3Sensor : virtual public TelemetrySensor {
-private:
+class SHTC3Sensor : virtual public TelemetrySensor
+{
+  private:
     Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();
 
-protected:
+  protected:
     virtual void setup() override;
-    
-public:
+
+  public:
     SHTC3Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
-};    
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/TelemetrySensor.h b/src/modules/Telemetry/Sensor/TelemetrySensor.h
index 97582f9b4..79dfbf312 100644
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.h
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.h
@@ -19,7 +19,8 @@ class TelemetrySensor
     TelemetrySensorType sensorType;
     unsigned status;
 
-    int32_t initI2CSensor() {
+    int32_t initI2CSensor()
+    {
         if (!status) {
             LOG_WARN("Could not connect to detected %s sensor.\n Removing from nodeTelemetrySensorsMap.\n", sensorName);
             nodeTelemetrySensorsMap[sensorType] = 0;
@@ -32,9 +33,7 @@ class TelemetrySensor
     virtual void setup();
 
   public:
-    bool hasSensor() { 
-        return sensorType < sizeof(nodeTelemetrySensorsMap) && nodeTelemetrySensorsMap[sensorType] > 0; 
-    }
+    bool hasSensor() { return sensorType < sizeof(nodeTelemetrySensorsMap) && nodeTelemetrySensorsMap[sensorType] > 0; }
 
     virtual int32_t runOnce() = 0;
     virtual bool getMetrics(Telemetry *measurement) = 0;
diff --git a/src/modules/esp32/StoreForwardModule.cpp b/src/modules/esp32/StoreForwardModule.cpp
index 825b0376b..36d023162 100644
--- a/src/modules/esp32/StoreForwardModule.cpp
+++ b/src/modules/esp32/StoreForwardModule.cpp
@@ -63,7 +63,8 @@ void StoreForwardModule::populatePSRAM()
         https://learn.upesy.com/en/programmation/psram.html#psram-tab
     */
 
-    LOG_DEBUG("*** Before PSRAM initilization: heap %d/%d PSRAM %d/%d\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreePsram(), ESP.getPsramSize());
+    LOG_DEBUG("*** Before PSRAM initilization: heap %d/%d PSRAM %d/%d\n", ESP.getFreeHeap(), ESP.getHeapSize(),
+              ESP.getFreePsram(), ESP.getPsramSize());
 
     this->packetHistoryTXQueue =
         static_cast<PacketHistoryStruct *>(ps_calloc(this->historyReturnMax, sizeof(PacketHistoryStruct)));
@@ -76,7 +77,8 @@ void StoreForwardModule::populatePSRAM()
 
     this->packetHistory = static_cast<PacketHistoryStruct *>(ps_calloc(numberOfPackets, sizeof(PacketHistoryStruct)));
 
-    LOG_DEBUG("*** After PSRAM initilization: heap %d/%d PSRAM %d/%d\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreePsram(), ESP.getPsramSize());
+    LOG_DEBUG("*** After PSRAM initilization: heap %d/%d PSRAM %d/%d\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreePsram(),
+              ESP.getPsramSize());
     LOG_DEBUG("*** numberOfPackets for packetHistory - %u\n", numberOfPackets);
 }
 
@@ -296,123 +298,125 @@ bool StoreForwardModule::handleReceivedProtobuf(const MeshPacket &mp, StoreAndFo
     requests++;
 
     switch (p->rr) {
-        case StoreAndForward_RequestResponse_CLIENT_ERROR:
-        case StoreAndForward_RequestResponse_CLIENT_ABORT:
-            if(is_server) {
-                // stop sending stuff, the client wants to abort or has another error
-                if ((this->busy) && (this->busyTo == getFrom(&mp))) {
-                    LOG_ERROR("*** Client in ERROR or ABORT requested\n");
-                    this->packetHistoryTXQueue_index = 0;
-                    this->busy = false;
-                }
+    case StoreAndForward_RequestResponse_CLIENT_ERROR:
+    case StoreAndForward_RequestResponse_CLIENT_ABORT:
+        if (is_server) {
+            // stop sending stuff, the client wants to abort or has another error
+            if ((this->busy) && (this->busyTo == getFrom(&mp))) {
+                LOG_ERROR("*** Client in ERROR or ABORT requested\n");
+                this->packetHistoryTXQueue_index = 0;
+                this->busy = false;
             }
-            break;
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_CLIENT_HISTORY:
-            if(is_server) {
-                requests_history++;
-                LOG_INFO("*** Client Request to send HISTORY\n");
-                // Send the last 60 minutes of messages.
-                if (this->busy) {
-                    storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_BUSY);
-                    LOG_INFO("*** S&F - Busy. Try again shortly.\n");
+    case StoreAndForward_RequestResponse_CLIENT_HISTORY:
+        if (is_server) {
+            requests_history++;
+            LOG_INFO("*** Client Request to send HISTORY\n");
+            // Send the last 60 minutes of messages.
+            if (this->busy) {
+                storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_BUSY);
+                LOG_INFO("*** S&F - Busy. Try again shortly.\n");
+            } else {
+                if ((p->which_variant == StoreAndForward_history_tag) && (p->variant.history.window > 0)) {
+                    storeForwardModule->historySend(p->variant.history.window * 60000, getFrom(&mp)); // window is in minutes
                 } else {
-                    if ((p->which_variant == StoreAndForward_history_tag) && (p->variant.history.window > 0)){
-                        storeForwardModule->historySend(p->variant.history.window * 60000, getFrom(&mp)); // window is in minutes
-                    } else {
-                        storeForwardModule->historySend(historyReturnWindow * 60000, getFrom(&mp)); // defaults to 4 hours
-                    }
+                    storeForwardModule->historySend(historyReturnWindow * 60000, getFrom(&mp)); // defaults to 4 hours
                 }
             }
-            break;
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_CLIENT_PING:
-            if(is_server) {
-                LOG_INFO("*** StoreAndForward_RequestResponse_CLIENT_PING\n");
-                // respond with a ROUTER PONG
-                storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_PONG);
+    case StoreAndForward_RequestResponse_CLIENT_PING:
+        if (is_server) {
+            LOG_INFO("*** StoreAndForward_RequestResponse_CLIENT_PING\n");
+            // respond with a ROUTER PONG
+            storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_PONG);
+        }
+        break;
+
+    case StoreAndForward_RequestResponse_CLIENT_PONG:
+        if (is_server) {
+            LOG_INFO("*** StoreAndForward_RequestResponse_CLIENT_PONG\n");
+            // The Client is alive, update NodeDB
+            nodeDB.updateFrom(mp);
+        }
+        break;
+
+    case StoreAndForward_RequestResponse_CLIENT_STATS:
+        if (is_server) {
+            LOG_INFO("*** Client Request to send STATS\n");
+            if (this->busy) {
+                storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_BUSY);
+                LOG_INFO("*** S&F - Busy. Try again shortly.\n");
+            } else {
+                storeForwardModule->statsSend(getFrom(&mp));
             }
-            break;
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_CLIENT_PONG:
-            if(is_server) {
-                LOG_INFO("*** StoreAndForward_RequestResponse_CLIENT_PONG\n");
-                // The Client is alive, update NodeDB
-                nodeDB.updateFrom(mp);
+    case StoreAndForward_RequestResponse_ROUTER_ERROR:
+    case StoreAndForward_RequestResponse_ROUTER_BUSY:
+        if (is_client) {
+            LOG_DEBUG("*** StoreAndForward_RequestResponse_ROUTER_BUSY\n");
+            // retry in messages_saved * packetTimeMax ms
+            retry_delay =
+                millis() + packetHistoryCurrent * packetTimeMax * (StoreAndForward_RequestResponse_ROUTER_ERROR ? 2 : 1);
+        }
+        break;
+
+    case StoreAndForward_RequestResponse_ROUTER_PONG:
+    // A router responded, this is equal to receiving a heartbeat
+    case StoreAndForward_RequestResponse_ROUTER_HEARTBEAT:
+        if (is_client) {
+            // register heartbeat and interval
+            if (p->which_variant == StoreAndForward_heartbeat_tag) {
+                heartbeatInterval = p->variant.heartbeat.period;
             }
-            break;
+            lastHeartbeat = millis();
+            LOG_INFO("*** StoreAndForward Heartbeat received\n");
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_CLIENT_STATS:
-            if(is_server) {
-                LOG_INFO("*** Client Request to send STATS\n");
-                if (this->busy) {
-                    storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_ROUTER_BUSY);
-                    LOG_INFO("*** S&F - Busy. Try again shortly.\n");
-                } else {
-                    storeForwardModule->statsSend(getFrom(&mp));
-                }
+    case StoreAndForward_RequestResponse_ROUTER_PING:
+        if (is_client) {
+            LOG_DEBUG("*** StoreAndForward_RequestResponse_ROUTER_PING\n");
+            // respond with a CLIENT PONG
+            storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_CLIENT_PONG);
+        }
+        break;
+
+    case StoreAndForward_RequestResponse_ROUTER_STATS:
+        if (is_client) {
+            LOG_DEBUG("*** Router Response STATS\n");
+            // These fields only have informational purpose on a client. Fill them to consume later.
+            if (p->which_variant == StoreAndForward_stats_tag) {
+                this->packetHistoryMax = p->variant.stats.messages_total;
+                this->packetHistoryCurrent = p->variant.stats.messages_saved;
+                this->records = p->variant.stats.messages_max;
+                this->requests = p->variant.stats.requests;
+                this->requests_history = p->variant.stats.requests_history;
+                this->heartbeat = p->variant.stats.heartbeat;
+                this->historyReturnMax = p->variant.stats.return_max;
+                this->historyReturnWindow = p->variant.stats.return_window;
             }
-            break;
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_ROUTER_ERROR:
-        case StoreAndForward_RequestResponse_ROUTER_BUSY:
-            if(is_client) {
-                LOG_DEBUG("*** StoreAndForward_RequestResponse_ROUTER_BUSY\n");
-                // retry in messages_saved * packetTimeMax ms
-                retry_delay = millis() + packetHistoryCurrent * packetTimeMax * (StoreAndForward_RequestResponse_ROUTER_ERROR ? 2 : 1);
+    case StoreAndForward_RequestResponse_ROUTER_HISTORY:
+        if (is_client) {
+            // These fields only have informational purpose on a client. Fill them to consume later.
+            if (p->which_variant == StoreAndForward_history_tag) {
+                this->historyReturnWindow = p->variant.history.window / 60000;
+                LOG_INFO("*** Router Response HISTORY - Sending %d messages from last %d minutes\n",
+                         p->variant.history.history_messages, this->historyReturnWindow);
             }
-            break;
+        }
+        break;
 
-        case StoreAndForward_RequestResponse_ROUTER_PONG:
-        // A router responded, this is equal to receiving a heartbeat
-        case StoreAndForward_RequestResponse_ROUTER_HEARTBEAT:
-            if(is_client) {
-                // register heartbeat and interval
-                if (p->which_variant == StoreAndForward_heartbeat_tag) {
-                    heartbeatInterval = p->variant.heartbeat.period;
-                }
-                lastHeartbeat = millis();
-                LOG_INFO("*** StoreAndForward Heartbeat received\n");
-            }
-            break;
-
-        case StoreAndForward_RequestResponse_ROUTER_PING:
-            if(is_client) {
-                LOG_DEBUG("*** StoreAndForward_RequestResponse_ROUTER_PING\n");
-                // respond with a CLIENT PONG
-                storeForwardModule->sendMessage(getFrom(&mp), StoreAndForward_RequestResponse_CLIENT_PONG);
-            }
-            break;
-
-        case StoreAndForward_RequestResponse_ROUTER_STATS:
-            if(is_client) {
-                LOG_DEBUG("*** Router Response STATS\n");
-                // These fields only have informational purpose on a client. Fill them to consume later.
-                if (p->which_variant == StoreAndForward_stats_tag) {
-                    this->packetHistoryMax = p->variant.stats.messages_total;
-                    this->packetHistoryCurrent = p->variant.stats.messages_saved;
-                    this->records = p->variant.stats.messages_max;
-                    this->requests = p->variant.stats.requests;
-                    this->requests_history = p->variant.stats.requests_history;
-                    this->heartbeat = p->variant.stats.heartbeat;
-                    this->historyReturnMax = p->variant.stats.return_max;
-                    this->historyReturnWindow = p->variant.stats.return_window;
-                }
-            }
-            break;
-
-        case StoreAndForward_RequestResponse_ROUTER_HISTORY:
-            if(is_client) {
-                // These fields only have informational purpose on a client. Fill them to consume later.
-                if (p->which_variant == StoreAndForward_history_tag) {
-                    this->historyReturnWindow = p->variant.history.window / 60000;
-                    LOG_INFO("*** Router Response HISTORY - Sending %d messages from last %d minutes\n", p->variant.history.history_messages, this->historyReturnWindow);
-                }
-            }
-            break;
-
-        default:
-            assert(0); // unexpected state
+    default:
+        assert(0); // unexpected state
     }
     return true; // There's no need for others to look at this message.
 }
@@ -437,7 +441,8 @@ StoreForwardModule::StoreForwardModule()
     if (moduleConfig.store_forward.enabled) {
 
         // Router
-        if ((config.device.role == Config_DeviceConfig_Role_ROUTER) || (config.device.role == Config_DeviceConfig_Role_ROUTER_CLIENT)) {
+        if ((config.device.role == Config_DeviceConfig_Role_ROUTER) ||
+            (config.device.role == Config_DeviceConfig_Role_ROUTER_CLIENT)) {
             LOG_INFO("*** Initializing Store & Forward Module in Router mode\n");
             if (ESP.getPsramSize() > 0) {
                 if (ESP.getFreePsram() >= 1024 * 1024) {
@@ -474,7 +479,8 @@ StoreForwardModule::StoreForwardModule()
 
             // Client
         }
-        if ((config.device.role == Config_DeviceConfig_Role_CLIENT) || (config.device.role == Config_DeviceConfig_Role_ROUTER_CLIENT)) {
+        if ((config.device.role == Config_DeviceConfig_Role_CLIENT) ||
+            (config.device.role == Config_DeviceConfig_Role_ROUTER_CLIENT)) {
             is_client = true;
             LOG_INFO("*** Initializing Store & Forward Module in Client mode\n");
         }
diff --git a/src/modules/esp32/StoreForwardModule.h b/src/modules/esp32/StoreForwardModule.h
index 4d9e080cf..b1c4084f3 100644
--- a/src/modules/esp32/StoreForwardModule.h
+++ b/src/modules/esp32/StoreForwardModule.h
@@ -66,12 +66,12 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
     */
     virtual bool wantPacket(const MeshPacket *p) override
     {
-        switch(p->decoded.portnum) {
-            case PortNum_TEXT_MESSAGE_APP:
-            case PortNum_STORE_FORWARD_APP:
-                return true;
-            default:
-                return false;
+        switch (p->decoded.portnum) {
+        case PortNum_TEXT_MESSAGE_APP:
+        case PortNum_STORE_FORWARD_APP:
+            return true;
+        default:
+            return false;
         }
     }
 
@@ -79,10 +79,10 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
     void populatePSRAM();
 
     // S&F Defaults
-    uint32_t historyReturnMax = 250; // 250 records
+    uint32_t historyReturnMax = 250;    // 250 records
     uint32_t historyReturnWindow = 240; // 4 hours
-    uint32_t records = 0; // Calculated
-    bool heartbeat = false; // No heartbeat.
+    uint32_t records = 0;               // Calculated
+    bool heartbeat = false;             // No heartbeat.
 
     // stats
     uint32_t requests = 0;
@@ -100,7 +100,6 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
     */
     virtual ProcessMessage handleReceived(const MeshPacket &mp) override;
     virtual bool handleReceivedProtobuf(const MeshPacket &mp, StoreAndForward *p);
-
 };
 
 extern StoreForwardModule *storeForwardModule;
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index f54ecd0b7..a6073af3b 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -12,8 +12,8 @@
 #if HAS_WIFI
 #include <WiFi.h>
 #endif
-#include <assert.h>
 #include "mqtt/JSON.h"
+#include <assert.h>
 
 MQTT *mqtt;
 
@@ -55,11 +55,15 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
             }
             LOG_DEBUG("Looking for Channel name: %s\n", ptr);
             Channel sendChannel = channels.getByName(ptr);
-            LOG_DEBUG("Found Channel name: %s (Index %d)\n", channels.getGlobalId(sendChannel.settings.channel_num), sendChannel.settings.channel_num);
+            LOG_DEBUG("Found Channel name: %s (Index %d)\n", channels.getGlobalId(sendChannel.settings.channel_num),
+                      sendChannel.settings.channel_num);
 
-            if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) && (json.find("type") != json.end()) && json["type"]->IsString() && (json["type"]->AsString().compare("sendtext") == 0)) {
+            if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) &&
+                (json.find("type") != json.end()) && json["type"]->IsString() &&
+                (json["type"]->AsString().compare("sendtext") == 0)) {
                 // this is a valid envelope
-                if (json["payload"]->IsString() && json["type"]->IsString() && (json["sender"]->AsString().compare(owner.id) != 0)) {
+                if (json["payload"]->IsString() && json["type"]->IsString() &&
+                    (json["sender"]->AsString().compare(owner.id) != 0)) {
                     std::string jsonPayloadStr = json["payload"]->AsString();
                     LOG_INFO("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length());
 
@@ -77,16 +81,20 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
                             LOG_WARN("Received MQTT json payload too long, dropping\n");
                         }
                     } else {
-                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n", sendChannel.settings.name);
+                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n",
+                                 sendChannel.settings.name);
                     }
                 } else {
                     LOG_DEBUG("JSON Ignoring downlink message we originally sent.\n");
                 }
-            } else if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) && (json.find("type") != json.end()) && json["type"]->IsString() && (json["type"]->AsString().compare("sendposition") == 0)) {
-                //invent the "sendposition" type for a valid envelope
-                if (json["payload"]->IsObject() && json["type"]->IsString() && (json["sender"]->AsString().compare(owner.id) != 0)) {
+            } else if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) &&
+                       (json.find("type") != json.end()) && json["type"]->IsString() &&
+                       (json["type"]->AsString().compare("sendposition") == 0)) {
+                // invent the "sendposition" type for a valid envelope
+                if (json["payload"]->IsObject() && json["type"]->IsString() &&
+                    (json["sender"]->AsString().compare(owner.id) != 0)) {
                     JSONObject posit;
-                    posit = json["payload"]->AsObject(); //get nested JSON Position
+                    posit = json["payload"]->AsObject(); // get nested JSON Position
                     Position pos = Position_init_default;
                     pos.latitude_i = posit["latitude_i"]->AsNumber();
                     pos.longitude_i = posit["longitude_i"]->AsNumber();
@@ -98,15 +106,17 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
                     p->decoded.portnum = PortNum_POSITION_APP;
                     p->channel = sendChannel.settings.channel_num;
                     if (sendChannel.settings.downlink_enabled) {
-                        p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &Position_msg, &pos); //make the Data protobuf from position
+                        p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes),
+                                                                     &Position_msg, &pos); // make the Data protobuf from position
                         service.sendToMesh(p, RX_SRC_LOCAL);
                     } else {
-                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n", sendChannel.settings.name);
+                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n",
+                                 sendChannel.settings.name);
                     }
                 } else {
                     LOG_DEBUG("JSON Ignoring downlink message we originally sent.\n");
                 }
-            } else{
+            } else {
                 LOG_ERROR("JSON Received payload on MQTT but not a valid envelope\n");
             }
         } else {
@@ -118,7 +128,7 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
         if (!pb_decode_from_bytes(payload, length, &ServiceEnvelope_msg, &e)) {
             LOG_ERROR("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
             return;
-        }else {
+        } else {
             if (strcmp(e.gateway_id, owner.id) == 0)
                 LOG_INFO("Ignoring downlink message we originally sent.\n");
             else {
@@ -148,7 +158,7 @@ void mqttInit()
 
 MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient), mqttQueue(MAX_MQTT_QUEUE)
 {
-    if(moduleConfig.mqtt.enabled) {
+    if (moduleConfig.mqtt.enabled) {
 
         assert(!mqtt);
         mqtt = this;
@@ -170,7 +180,7 @@ void MQTT::reconnect()
 {
     if (wantsLink()) {
         // Defaults
-        int serverPort = 1883;  
+        int serverPort = 1883;
         const char *serverAddr = default_mqtt_address;
         const char *mqttUsername = default_mqtt_username;
         const char *mqttPassword = default_mqtt_password;
@@ -192,7 +202,8 @@ void MQTT::reconnect()
         pubSub.setServer(serverAddr, serverPort);
         pubSub.setBufferSize(512);
 
-        LOG_INFO("Connecting to MQTT server %s, port: %d, username: %s, password: %s\n", serverAddr, serverPort, mqttUsername, mqttPassword);
+        LOG_INFO("Connecting to MQTT server %s, port: %d, username: %s, password: %s\n", serverAddr, serverPort, mqttUsername,
+                 mqttPassword);
         auto myStatus = (statusTopic + owner.id);
         bool connected = pubSub.connect(owner.id, mqttUsername, mqttPassword, myStatus.c_str(), 1, true, "offline");
         if (connected) {
@@ -208,7 +219,7 @@ void MQTT::reconnect()
             sendSubscriptions();
         } else {
 #if HAS_WIFI && !defined(ARCH_PORTDUINO)
-            LOG_ERROR("Failed to contact MQTT server (%d/5)...\n",reconnectCount + 1);
+            LOG_ERROR("Failed to contact MQTT server (%d/5)...\n", reconnectCount + 1);
             if (reconnectCount >= 4) {
                 needReconnect = true;
                 wifiReconnect->setIntervalFromNow(0);
@@ -216,7 +227,7 @@ void MQTT::reconnect()
             } else {
                 reconnectCount++;
             }
-            
+
 #endif
         }
     }
@@ -267,7 +278,7 @@ bool MQTT::wantsLink() const
 
 int32_t MQTT::runOnce()
 {
-    if(!moduleConfig.mqtt.enabled) {
+    if (!moduleConfig.mqtt.enabled) {
         return disable();
     }
     bool wantConnection = wantsLink();
@@ -277,7 +288,8 @@ int32_t MQTT::runOnce()
         if (wantConnection) {
             reconnect();
 
-            // If we succeeded, empty the queue one by one and start reading rapidly, else try again in 30 seconds (TCP connections are EXPENSIVE so try rarely)
+            // If we succeeded, empty the queue one by one and start reading rapidly, else try again in 30 seconds (TCP
+            // connections are EXPENSIVE so try rarely)
             if (pubSub.connected()) {
                 if (!mqttQueue.isEmpty()) {
                     // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
@@ -295,7 +307,8 @@ int32_t MQTT::runOnce()
                         auto jsonString = this->downstreamPacketToJson(env->packet);
                         if (jsonString.length() != 0) {
                             String topicJson = jsonTopic + env->channel_id + "/" + owner.id;
-                            LOG_INFO("JSON publish message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(), jsonString.c_str());
+                            LOG_INFO("JSON publish message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(),
+                                     jsonString.c_str());
                             pubSub.publish(topicJson.c_str(), jsonString.c_str(), false);
                         }
                     }
@@ -348,7 +361,8 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
                 auto jsonString = this->downstreamPacketToJson((MeshPacket *)&mp);
                 if (jsonString.length() != 0) {
                     String topicJson = jsonTopic + channelId + "/" + owner.id;
-                    LOG_INFO("JSON publish message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(), jsonString.c_str());
+                    LOG_INFO("JSON publish message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(),
+                             jsonString.c_str());
                     pubSub.publish(topicJson.c_str(), jsonString.c_str(), false);
                 }
             }
@@ -453,11 +467,17 @@ std::string MQTT::downstreamPacketToJson(MeshPacket *mp)
             memset(&scratch, 0, sizeof(scratch));
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &Position_msg, &scratch)) {
                 decoded = &scratch;
-                if((int)decoded->time){msgPayload["time"] = new JSONValue((int)decoded->time);}
-                if ((int)decoded->timestamp){msgPayload["timestamp"] = new JSONValue((int)decoded->timestamp);}
+                if ((int)decoded->time) {
+                    msgPayload["time"] = new JSONValue((int)decoded->time);
+                }
+                if ((int)decoded->timestamp) {
+                    msgPayload["timestamp"] = new JSONValue((int)decoded->timestamp);
+                }
                 msgPayload["latitude_i"] = new JSONValue((int)decoded->latitude_i);
                 msgPayload["longitude_i"] = new JSONValue((int)decoded->longitude_i);
-                if((int)decoded->altitude){msgPayload["altitude"] = new JSONValue((int)decoded->altitude);}
+                if ((int)decoded->altitude) {
+                    msgPayload["altitude"] = new JSONValue((int)decoded->altitude);
+                }
                 jsonObj["payload"] = new JSONValue(msgPayload);
             } else {
                 LOG_ERROR("Error decoding protobuf for position message!\n");
diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
index 563ba7164..3f2cf2de6 100644
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -53,7 +53,7 @@ class MQTT : private concurrency::OSThread
     void reconnect();
 
     bool connected();
-    
+
   protected:
     PointerQueue<ServiceEnvelope> mqttQueue;
 
@@ -80,7 +80,7 @@ class MQTT : private concurrency::OSThread
     std::string downstreamPacketToJson(MeshPacket *mp);
 
     /// Return 0 if sleep is okay, veto sleep if we are connected to pubsub server
-    // int preflightSleepCb(void *unused = NULL) { return pubSub.connected() ? 1 : 0; }    
+    // int preflightSleepCb(void *unused = NULL) { return pubSub.connected() ? 1 : 0; }
 };
 
 void mqttInit();
diff --git a/src/xmodem.cpp b/src/xmodem.cpp
index 4f61c6c96..aed551795 100644
--- a/src/xmodem.cpp
+++ b/src/xmodem.cpp
@@ -3,9 +3,9 @@
  ***********************************************************************************************************************
  * Copyright 2001-2019 Georges Menie (www.menie.org)
  * All rights reserved.
- * 
+ *
  * Adapted for protobuf encapsulation. this is not really Xmodem any more.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -36,14 +36,14 @@ XModemAdapter xModem;
 
 XModemAdapter::XModemAdapter()
 {
-    xmodemStore = (XModem*)malloc(XModem_size);
+    xmodemStore = (XModem *)malloc(XModem_size);
 }
 
 unsigned short XModemAdapter::crc16_ccitt(const pb_byte_t *buffer, int length)
 {
     unsigned short crc16 = 0;
-    while(length != 0) {
-        crc16  = (unsigned char)(crc16 >> 8) | (crc16 << 8);
+    while (length != 0) {
+        crc16 = (unsigned char)(crc16 >> 8) | (crc16 << 8);
         crc16 ^= *buffer;
         crc16 ^= (unsigned char)(crc16 & 0xff) >> 4;
         crc16 ^= (crc16 << 8) << 4;
@@ -64,7 +64,8 @@ int XModemAdapter::check(const pb_byte_t *buf, int sz, unsigned short tcrc)
         return 0;
 }
 
-void XModemAdapter::sendControl(XModem_Control c) {
+void XModemAdapter::sendControl(XModem_Control c)
+{
     memset(xmodemStore, 0, XModem_size);
     xmodemStore->control = c;
     LOG_DEBUG("XModem: Notify Sending control %d.\n", c);
@@ -73,7 +74,7 @@ void XModemAdapter::sendControl(XModem_Control c) {
 
 XModem *XModemAdapter::getForPhone()
 {
-    if(xmodemStore) {
+    if (xmodemStore) {
         return xmodemStore;
     } else {
         return NULL;
@@ -82,138 +83,139 @@ XModem *XModemAdapter::getForPhone()
 
 void XModemAdapter::handlePacket(XModem xmodemPacket)
 {
-    switch(xmodemPacket.control) {
-        case XModem_Control_SOH:
-        case XModem_Control_STX:
-            if ((xmodemPacket.seq == 0) && !isReceiving && !isTransmitting) {
-                // NULL packet has the destination filename
-                memcpy(filename, &xmodemPacket.buffer.bytes, xmodemPacket.buffer.size);
-                if(xmodemPacket.control == XModem_Control_SOH) { // Receive this file and put to Flash
-                    file = FSCom.open(filename, FILE_O_WRITE);
-                    if(file) {
-                        sendControl(XModem_Control_ACK);
-                        isReceiving = true;
-                        packetno = 1;
-                        break;
-                    }
-                    sendControl(XModem_Control_NAK);
-                    isReceiving = false;
-                    break;
-                } else { // Transmit this file from Flash
-                    LOG_INFO("XModem: Transmitting file %s\n", filename);
-                    file = FSCom.open(filename, FILE_O_READ);
-                    if (file) {
-                        packetno = 1;
-                        isTransmitting = true;
-                        memset(xmodemStore, 0, XModem_size);
-                        xmodemStore->control = XModem_Control_SOH;
-                        xmodemStore->seq = packetno;
-                        xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
-                        xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
-                        LOG_DEBUG("XModem: STX Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
-                        if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
-                            isEOT = true;
-                            // send EOT on next Ack
-                        }
-                        packetReady.notifyObservers(packetno);
-                        break;
-                    }
-                    sendControl(XModem_Control_NAK);
-                    isTransmitting = false;
+    switch (xmodemPacket.control) {
+    case XModem_Control_SOH:
+    case XModem_Control_STX:
+        if ((xmodemPacket.seq == 0) && !isReceiving && !isTransmitting) {
+            // NULL packet has the destination filename
+            memcpy(filename, &xmodemPacket.buffer.bytes, xmodemPacket.buffer.size);
+            if (xmodemPacket.control == XModem_Control_SOH) { // Receive this file and put to Flash
+                file = FSCom.open(filename, FILE_O_WRITE);
+                if (file) {
+                    sendControl(XModem_Control_ACK);
+                    isReceiving = true;
+                    packetno = 1;
                     break;
                 }
-            } else {
-                if (isReceiving) {
-                    // normal file data packet
-                    if ((xmodemPacket.seq == packetno) && check(xmodemPacket.buffer.bytes, xmodemPacket.buffer.size, xmodemPacket.crc16)) {
-                        // valid packet
-                        file.write(xmodemPacket.buffer.bytes, xmodemPacket.buffer.size);
-                        sendControl(XModem_Control_ACK);
-                        packetno++;
-                        break;
+                sendControl(XModem_Control_NAK);
+                isReceiving = false;
+                break;
+            } else { // Transmit this file from Flash
+                LOG_INFO("XModem: Transmitting file %s\n", filename);
+                file = FSCom.open(filename, FILE_O_READ);
+                if (file) {
+                    packetno = 1;
+                    isTransmitting = true;
+                    memset(xmodemStore, 0, XModem_size);
+                    xmodemStore->control = XModem_Control_SOH;
+                    xmodemStore->seq = packetno;
+                    xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
+                    xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
+                    LOG_DEBUG("XModem: STX Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
+                    if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
+                        isEOT = true;
+                        // send EOT on next Ack
                     }
-                    // invalid packet
-                    sendControl(XModem_Control_NAK);
-                    break;
-                } else if (isTransmitting) {
-                    // just received something weird.
-                    sendControl(XModem_Control_CAN);
-                    isTransmitting = false;
+                    packetReady.notifyObservers(packetno);
                     break;
                 }
+                sendControl(XModem_Control_NAK);
+                isTransmitting = false;
+                break;
             }
-            break;
-        case XModem_Control_EOT:
-            // End of transmission
-            sendControl(XModem_Control_ACK);
-            file.close();
-            isReceiving = false;
-            break;
-        case XModem_Control_CAN:
-            // Cancel transmission and remove file
-            sendControl(XModem_Control_ACK);
-            file.close();
-            FSCom.remove(filename);
-            isReceiving = false;
-            break;
-        case XModem_Control_ACK:
-            // Acknowledge Send the next packet
-            if (isTransmitting) {
-                if (isEOT) {
-                    sendControl(XModem_Control_EOT);
-                    file.close();
-                    LOG_INFO("XModem: Finished sending file %s\n", filename);
-                    isTransmitting = false;
-                    isEOT = false;
+        } else {
+            if (isReceiving) {
+                // normal file data packet
+                if ((xmodemPacket.seq == packetno) &&
+                    check(xmodemPacket.buffer.bytes, xmodemPacket.buffer.size, xmodemPacket.crc16)) {
+                    // valid packet
+                    file.write(xmodemPacket.buffer.bytes, xmodemPacket.buffer.size);
+                    sendControl(XModem_Control_ACK);
+                    packetno++;
                     break;
                 }
-                retrans = MAXRETRANS; // reset retransmit counter
-                packetno++;
-                memset(xmodemStore, 0, XModem_size);
-                xmodemStore->control = XModem_Control_SOH;
-                xmodemStore->seq = packetno;
-                xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
-                xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
-                LOG_DEBUG("XModem: ACK Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
-                if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
-                    isEOT = true;
-                    // send EOT on next Ack
-                }
-                packetReady.notifyObservers(packetno);
-            } else {
+                // invalid packet
+                sendControl(XModem_Control_NAK);
+                break;
+            } else if (isTransmitting) {
                 // just received something weird.
                 sendControl(XModem_Control_CAN);
+                isTransmitting = false;
+                break;
             }
-            break;
-        case XModem_Control_NAK:
-            // Negative acknowledge. Send the same buffer again
-            if (isTransmitting) {
-                if (--retrans <= 0) {
-                    sendControl(XModem_Control_CAN);
-                    file.close();
-                    LOG_INFO("XModem: Retransmit timeout, cancelling file %s\n", filename);
-                    isTransmitting = false;
-                    break;
-                }
-                memset(xmodemStore, 0, XModem_size);
-                xmodemStore->control = XModem_Control_SOH;
-                xmodemStore->seq = packetno;
-                file.seek((packetno-1) * sizeof(XModem_buffer_t::bytes));
-                xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
-                xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
-                LOG_DEBUG("XModem: NAK Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
-                if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
-                    isEOT = true;
-                    // send EOT on next Ack
-                }
-                packetReady.notifyObservers(packetno);
-            } else {
-                // just received something weird.
+        }
+        break;
+    case XModem_Control_EOT:
+        // End of transmission
+        sendControl(XModem_Control_ACK);
+        file.close();
+        isReceiving = false;
+        break;
+    case XModem_Control_CAN:
+        // Cancel transmission and remove file
+        sendControl(XModem_Control_ACK);
+        file.close();
+        FSCom.remove(filename);
+        isReceiving = false;
+        break;
+    case XModem_Control_ACK:
+        // Acknowledge Send the next packet
+        if (isTransmitting) {
+            if (isEOT) {
+                sendControl(XModem_Control_EOT);
+                file.close();
+                LOG_INFO("XModem: Finished sending file %s\n", filename);
+                isTransmitting = false;
+                isEOT = false;
+                break;
+            }
+            retrans = MAXRETRANS; // reset retransmit counter
+            packetno++;
+            memset(xmodemStore, 0, XModem_size);
+            xmodemStore->control = XModem_Control_SOH;
+            xmodemStore->seq = packetno;
+            xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
+            xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
+            LOG_DEBUG("XModem: ACK Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
+            if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
+                isEOT = true;
+                // send EOT on next Ack
+            }
+            packetReady.notifyObservers(packetno);
+        } else {
+            // just received something weird.
+            sendControl(XModem_Control_CAN);
+        }
+        break;
+    case XModem_Control_NAK:
+        // Negative acknowledge. Send the same buffer again
+        if (isTransmitting) {
+            if (--retrans <= 0) {
                 sendControl(XModem_Control_CAN);
+                file.close();
+                LOG_INFO("XModem: Retransmit timeout, cancelling file %s\n", filename);
+                isTransmitting = false;
+                break;
             }
-            break;
-        default:
-            // Unknown control character
-            break;
+            memset(xmodemStore, 0, XModem_size);
+            xmodemStore->control = XModem_Control_SOH;
+            xmodemStore->seq = packetno;
+            file.seek((packetno - 1) * sizeof(XModem_buffer_t::bytes));
+            xmodemStore->buffer.size = file.read(xmodemStore->buffer.bytes, sizeof(XModem_buffer_t::bytes));
+            xmodemStore->crc16 = crc16_ccitt(xmodemStore->buffer.bytes, xmodemStore->buffer.size);
+            LOG_DEBUG("XModem: NAK Notify Sending packet %d, %d Bytes.\n", packetno, xmodemStore->buffer.size);
+            if (xmodemStore->buffer.size < sizeof(XModem_buffer_t::bytes)) {
+                isEOT = true;
+                // send EOT on next Ack
+            }
+            packetReady.notifyObservers(packetno);
+        } else {
+            // just received something weird.
+            sendControl(XModem_Control_CAN);
+        }
+        break;
+    default:
+        // Unknown control character
+        break;
     }
 }
diff --git a/src/xmodem.h b/src/xmodem.h
index 3540c0649..8a9c08db6 100644
--- a/src/xmodem.h
+++ b/src/xmodem.h
@@ -3,9 +3,9 @@
  ***********************************************************************************************************************
  * Copyright 2001-2019 Georges Menie (www.menie.org)
  * All rights reserved.
- * 
+ *
  * Adapted for protobuf encapsulation. this is not really Xmodem any more.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -32,45 +32,45 @@
 
 #pragma once
 
+#include "FSCommon.h"
 #include "configuration.h"
 #include "mesh/generated/meshtastic/xmodem.pb.h"
-#include "FSCommon.h"
 
 #define MAXRETRANS 25
 
 class XModemAdapter
 {
-    public:
-        // Called when we put a fragment in the outgoing memory
-        Observable<uint32_t> packetReady;
+  public:
+    // Called when we put a fragment in the outgoing memory
+    Observable<uint32_t> packetReady;
 
-        XModemAdapter();
+    XModemAdapter();
 
-        void handlePacket(XModem xmodemPacket);
-        XModem *getForPhone();
+    void handlePacket(XModem xmodemPacket);
+    XModem *getForPhone();
 
-    private:
-        bool isReceiving = false;
-        bool isTransmitting = false;
-        bool isEOT = false;
+  private:
+    bool isReceiving = false;
+    bool isTransmitting = false;
+    bool isEOT = false;
 
-        int retrans = MAXRETRANS;
+    int retrans = MAXRETRANS;
 
-        uint16_t packetno = 0;
+    uint16_t packetno = 0;
 
 #ifdef ARCH_NRF52
-        File file = File(FSCom);
+    File file = File(FSCom);
 #else
-        File file;
+    File file;
 #endif
 
-        char filename[sizeof(XModem_buffer_t::bytes)] = {0};
+    char filename[sizeof(XModem_buffer_t::bytes)] = {0};
 
-    protected:
-        XModem *xmodemStore = NULL;
-        unsigned short crc16_ccitt(const pb_byte_t *buffer, int length);
-        int check(const pb_byte_t *buf, int sz, unsigned short tcrc);
-        void sendControl(XModem_Control c);
+  protected:
+    XModem *xmodemStore = NULL;
+    unsigned short crc16_ccitt(const pb_byte_t *buffer, int length);
+    int check(const pb_byte_t *buf, int sz, unsigned short tcrc);
+    void sendControl(XModem_Control c);
 };
 
 extern XModemAdapter xModem;