diff --git a/src/core/analogsensor.cpp b/src/core/analogsensor.cpp
index 7306f2f7d..1bb66e64c 100644
--- a/src/core/analogsensor.cpp
+++ b/src/core/analogsensor.cpp
@@ -675,7 +675,7 @@ void AnalogSensor::publish_values(const bool force) {
             }
             return;
         } else if (!EMSESP::mqtt_.get_publish_onchange(0)) {
-            return; // wait for first time periode
+            return; // wait for first time period
         }
     }
 
diff --git a/src/core/roomcontrol.cpp b/src/core/roomcontrol.cpp
index 7366bc8f8..799db788f 100644
--- a/src/core/roomcontrol.cpp
+++ b/src/core/roomcontrol.cpp
@@ -78,9 +78,8 @@ uint8_t Roomctrl::get_hc(uint8_t addr) {
     } else if (addr >= 0x38 && addr <= 0x3B
                && (type_[addr - 0x38] == RC100H || type_[addr - 0x38] == RC200 || type_[addr - 0x38] == RC100 || type_[addr - 0x38] == RT800
                    || type_[addr - 0x38] == RC120RF)) {
-            return addr - 0x38; // RC100H, RC200
-        }
-    else if (addr >= 0x18 && addr <= 0x1B && (type_[addr - 0x18] == RC20 || type_[addr - 0x18] == FB10)) {
+        return addr - 0x38; // RC100H, RC200
+    } else if (addr >= 0x18 && addr <= 0x1B && (type_[addr - 0x18] == RC20 || type_[addr - 0x18] == FB10)) {
         return addr - 0x18; // RC20, FB10
     }
     return 0xFF; // invalid
diff --git a/src/core/temperaturesensor.cpp b/src/core/temperaturesensor.cpp
index cc9e757eb..cc2b9f989 100644
--- a/src/core/temperaturesensor.cpp
+++ b/src/core/temperaturesensor.cpp
@@ -475,12 +475,12 @@ void TemperatureSensor::publish_values(const bool force) {
 
     if (force) {
         if (Mqtt::publish_single()) {
-        for (const auto & sensor : sensors_) {
-            publish_sensor(sensor);
-        }
+            for (const auto & sensor : sensors_) {
+                publish_sensor(sensor);
+            }
             return;
         } else if (!EMSESP::mqtt_.get_publish_onchange(0)) {
-            return; // wait for first time periode
+            return; // wait for first time period
         }
     }
 
diff --git a/src/web/WebCustomEntityService.cpp b/src/web/WebCustomEntityService.cpp
index 62d409c71..dcb3ff23b 100644
--- a/src/web/WebCustomEntityService.cpp
+++ b/src/web/WebCustomEntityService.cpp
@@ -389,7 +389,7 @@ void WebCustomEntityService::publish(const bool force) {
             }
             return;
         } else if (!EMSESP::mqtt_.get_publish_onchange(0)) {
-            return; // wait for first time periode
+            return; // wait for first time period
         }
     }
 
diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp
index f88a1f8b1..1f3034fad 100644
--- a/src/web/WebSchedulerService.cpp
+++ b/src/web/WebSchedulerService.cpp
@@ -223,7 +223,7 @@ void WebSchedulerService::publish(const bool force) {
             }
             return;
         } else if (!EMSESP::mqtt_.get_publish_onchange(0)) {
-            return; // wait for first time periode
+            return; // wait for first time period
         }
     }