diff --git a/src/bme_utils.cpp b/src/bme_utils.cpp
index aad3a43..92e66f5 100644
--- a/src/bme_utils.cpp
+++ b/src/bme_utils.cpp
@@ -181,7 +181,6 @@ namespace BME_Utils {
     }
 
     String readDataSensor() {
-        String wx, tempStr, humStr, presStr;
         switch (wxModuleType) {
             case 1: // BME280
                 bme280.takeForcedMeasurement();
@@ -214,20 +213,23 @@ namespace BME_Utils {
                 break;
         }    
 
+        String wx;
         if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {
             Serial.println("BME/BMP/Si7021 Module data failed");
             wx = ".../...g...t...r...p...P...h..b.....";
             fifthLine = "";
             return wx;
         } else {
-            tempStr = generateTempString(((newTemp + Config.bme.temperatureCorrection) * 1.8) + 32);
+            String tempStr = generateTempString(((newTemp + Config.bme.temperatureCorrection) * 1.8) + 32);
             
+            String humStr;
             if (wxModuleType == 1 || wxModuleType == 3 || wxModuleType == 4) {
                 humStr  = generateHumString(newHum);
             } else if (wxModuleType == 2) {
                 humStr  = "..";
             }
             
+            String presStr;
             if (wxModuleAddress == 4) {
                 presStr = ".....";
             } else {
diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
index 793c5d8..b3e93d7 100644
--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -33,7 +33,7 @@ namespace DIGI_Utils {
             packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":}")));
         } else {
             packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":")));
-        }        
+        }
         return packetToRepeat;
     }
 
@@ -46,7 +46,7 @@ namespace DIGI_Utils {
             temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
         }
         if (temp.indexOf(",") > 2) { // checks for path
-            const String& path = temp.substring(temp.indexOf(",") + 1);
+            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
             if (path.indexOf(Config.beacon.path) != -1) {
                 return buildPacket(path, packet, thirdParty);
             } else {