diff --git a/scripts/esptool.py b/scripts/esptool.py
index 6bfa1f7b6..69df228da 100755
--- a/scripts/esptool.py
+++ b/scripts/esptool.py
@@ -1595,7 +1595,7 @@ class ESP32FirmwareImage(BaseFirmwareImage):
                 load_file.seek(start)
                 calc_digest = hashlib.sha256()
                 calc_digest.update(load_file.read(end - start))
-                self.calc_digest = calc_digest.digest()  # TODO: decide what to do here?
+                self.calc_digest = calc_digest.digest()  # decide what to do here?
 
             self.verify()
 
@@ -1608,7 +1608,7 @@ class ESP32FirmwareImage(BaseFirmwareImage):
         return "%s.bin" % (os.path.splitext(input_file)[0])
 
     def warn_if_unusual_segment(self, offset, size, is_irom_segment):
-        pass  # TODO: add warnings for ESP32 segment offset/size combinations that are wrong
+        pass  # add warnings for ESP32 segment offset/size combinations that are wrong
 
     def save(self, filename):
         total_segments = 0
@@ -2799,7 +2799,7 @@ class SpiConnectionAction(argparse.Action):
             if any([v for v in values if v > 33 or v < 0]):
                 raise argparse.ArgumentError(self, 'Pin numbers must be in the range 0-33.')
             # encode the pin numbers as a 32-bit integer with packed 6-bit values, the same way ESP32 ROM takes them
-            # TODO: make this less ESP32 ROM specific somehow...
+            # todo: make this less ESP32 ROM specific somehow...
             clk,q,d,hd,cs = values
             value = (hd << 24) | (cs << 18) | (d << 12) | (q << 6) | clk
         else:
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 48874f457..8be3791b0 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -719,7 +719,7 @@ void Boiler::set_max_power(const char * value, const int8_t id) {
     write_command(EMS_TYPE_UBAParameters, 2, v);
 }
 
-// set oiler on hysteresis
+// set boiler on hysteresis
 void Boiler::set_hyst_on(const char * value, const int8_t id) {
     int v = 0;
     if (!Helpers::value2number(value, v)) {
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 73f0843ea..85c762516 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -317,7 +317,6 @@ void Thermostat::publish_values() {
         }
 
         // send this specific data using the thermostat_data topic
-        // if ((mqtt_format_ == MQTT_format::SINGLE) || (mqtt_format_ == MQTT_format::HA)) {
         if (mqtt_format_ != MQTT_format::NESTED) {
             Mqtt::publish("thermostat_data", doc);
             rootThermostat = doc.to<JsonObject>(); // clear object