diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp
index 0e1360a4..d9a88fbb 100644
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -11,7 +11,6 @@
 
 extern Configuration  Config;
 extern WiFiClient     espClient;
-extern int            internalLedPin;
 extern uint32_t       lastScreenOn;
 extern String         firstLine;
 extern String         secondLine;
@@ -29,7 +28,7 @@ namespace APRS_IS_Utils {
     }
 
     void connect() {
-        int count = 0;
+        uint8_t count = 0;
         String aprsauth;
         Serial.print("Connecting to APRS-IS ...     ");
         while (!espClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp
index 53820da1..a11bb0b9 100644
--- a/src/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -30,7 +30,7 @@ namespace BATTERY_Utils {
     float checkBattery() { 
         int sample;
         int sampleSum = 0;
-        for (int i=0; i<100; i++) {
+        for (int i = 0; i < 100; i++) {
             #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_WSL)
             sample = analogRead(batteryPin);
             #endif
@@ -51,7 +51,7 @@ namespace BATTERY_Utils {
     float checkExternalVoltage() {
         int sample;
         int sampleSum = 0;
-        for (int i=0; i<100; i++) {
+        for (int i = 0; i < 100; i++) {
             sample = analogRead(Config.externalVoltagePin);
             sampleSum += sample;
             delayMicroseconds(50); 
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index 0381c2d8..b35c4fc2 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -18,7 +18,7 @@ namespace GPS_Utils {
         int v = n;
         r += v;
         r += '.';
-        for (int i=0;i<ndec;i++) {
+        for (int i = 0; i < ndec; i++) {
             n -= v;
             n = 10 * abs(n);
             v = n;
@@ -158,7 +158,7 @@ namespace GPS_Utils {
     }
 
     String getDistance(String packet) {
-        int encodedBytePosition = 0;
+        uint8_t encodedBytePosition = 0;
         if (packet.indexOf(":!") > 10) {
             encodedBytePosition = packet.indexOf(":!") + 14;
         }
diff --git a/src/utils.cpp b/src/utils.cpp
index 9b5abe5e..84277d97 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -199,7 +199,7 @@ namespace Utils {
             fifthLine = "LoRa Rx ----> LoRa Tx";
             sender = packet.substring(3,packet.indexOf(">"));
         }
-        for (int i=sender.length();i<9;i++) {
+        for (int i = sender.length(); i < 9; i++) {
             sender += " ";
         }
         if (packet.indexOf("::") >= 10) {
diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp
index 24316bee..34289618 100644
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -42,7 +42,7 @@ namespace WIFI_Utils {
         if (currentWiFi->ssid == "") {
             startAP = true;
         } else {
-            int wifiCounter = 0;
+            uint8_t wifiCounter = 0;
             WiFi.mode(WIFI_STA);
             WiFi.disconnect();
             delay(500);