diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index c166b96e4..7811c134d 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1412,7 +1412,8 @@ void NodeDB::loadFromDisk()
     }
     if (portduino_config.has_statusMessage) {
         moduleConfig.has_statusmessage = true;
-        strncpy(moduleConfig.statusmessage.node_status, portduino_config.statusMessage.c_str(), sizeof(moduleConfig.statusmessage.node_status));
+        strncpy(moduleConfig.statusmessage.node_status, portduino_config.statusMessage.c_str(),
+                sizeof(moduleConfig.statusmessage.node_status));
         moduleConfig.statusmessage.node_status[sizeof(moduleConfig.statusmessage.node_status) - 1] = '\0';
     }
     if (portduino_config.enable_UDP) {
diff --git a/src/modules/StatusMessageModule.cpp b/src/modules/StatusMessageModule.cpp
index 5fab2f647..139a74d8e 100644
--- a/src/modules/StatusMessageModule.cpp
+++ b/src/modules/StatusMessageModule.cpp
@@ -1,9 +1,8 @@
 #if !MESHTASTIC_EXCLUDE_STATUS
 
 #include "StatusMessageModule.h"
-#include "ProtobufModule.h"
 #include "MeshService.h"
-
+#include "ProtobufModule.h"
 
 StatusMessageModule *statusMessageModule;
 
@@ -15,15 +14,13 @@ int32_t StatusMessageModule::runOnce()
         strncpy(ourStatus.status, moduleConfig.statusmessage.node_status, sizeof(ourStatus.status));
         ourStatus.status[sizeof(ourStatus.status) - 1] = '\0'; // ensure null termination
         meshtastic_MeshPacket *p = allocDataPacket();
-        p->decoded.payload.size =
-            pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), meshtastic_StatusMessage_fields, &ourStatus);
+        p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes),
+                                                     meshtastic_StatusMessage_fields, &ourStatus);
         p->to = NODENUM_BROADCAST;
         p->decoded.want_response = false;
         p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
         p->channel = 0;
         service->sendToMesh(p);
-
-        
     }
 
     return 1000 * 12 * 60 * 60;
@@ -32,16 +29,13 @@ int32_t StatusMessageModule::runOnce()
 ProcessMessage StatusMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
     if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-                meshtastic_StatusMessage incomingMessage;
+        meshtastic_StatusMessage incomingMessage;
         if (pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_StatusMessage_fields,
                                  &incomingMessage)) {
             LOG_INFO("Received a NodeStatus message %s", incomingMessage.status);
         }
-
     }
     return ProcessMessage::CONTINUE;
 }
 
-
-
 #endif
\ No newline at end of file
diff --git a/src/modules/StatusMessageModule.h b/src/modules/StatusMessageModule.h
index 223c423be..8aff2e232 100644
--- a/src/modules/StatusMessageModule.h
+++ b/src/modules/StatusMessageModule.h
@@ -3,8 +3,6 @@
 #include "SinglePortModule.h"
 #include "configuration.h"
 
-
-
 class StatusMessageModule : public SinglePortModule, private concurrency::OSThread
 {
 
@@ -12,12 +10,13 @@ class StatusMessageModule : public SinglePortModule, private concurrency::OSThre
     /** Constructor
      * name is for debugging output
      */
-    StatusMessageModule() : SinglePortModule("statusMessage", meshtastic_PortNum_NODE_STATUS_APP), concurrency::OSThread("StatusMessage")
+    StatusMessageModule()
+        : SinglePortModule("statusMessage", meshtastic_PortNum_NODE_STATUS_APP), concurrency::OSThread("StatusMessage")
     {
-      if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
-        this->setInterval(2 * 60 * 1000);
-      }
-      // TODO: If we have a string, set the initial delay (15 minutes maybe)
+        if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
+            this->setInterval(2 * 60 * 1000);
+        }
+        // TODO: If we have a string, set the initial delay (15 minutes maybe)
     }
 
     virtual int32_t runOnce() override;
diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index 63a505e94..f957717a1 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -65,7 +65,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
             return ARGP_ERR_UNKNOWN;
         else
             checkConfigPort = false;
-            printf("Using config file %d\n", TCPPort);
+        printf("Using config file %d\n", TCPPort);
         break;
     case 'c':
         configPath = arg;
@@ -882,10 +882,8 @@ bool loadConfig(const char *configPath)
             }
             if (checkConfigPort) {
                 portduino_config.api_port = (yamlConfig["General"]["APIPort"]).as<int>(-1);
-                if (portduino_config.api_port != -1 &&
-                portduino_config.api_port > 1023 &&
-                portduino_config.api_port < 65536) {
-                TCPPort = (portduino_config.api_port);
+                if (portduino_config.api_port != -1 && portduino_config.api_port > 1023 && portduino_config.api_port < 65536) {
+                    TCPPort = (portduino_config.api_port);
                 }
             }
             portduino_config.mac_address = (yamlConfig["General"]["MACAddress"]).as<std::string>("");
diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h
index a15539ef3..70b8b32ec 100644
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -510,11 +510,9 @@ extern struct portduino_config_struct {
             }
             if (has_statusMessage) {
                 out << YAML::Key << "StatusMessage" << YAML::Value << statusMessage;
-
             }
             if (enable_UDP) {
                 out << YAML::Key << "EnableUDP" << YAML::Value << true;
-
             }
 
             out << YAML::EndMap; // Config