diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 4d7e8cea7..bb3154670 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -110,12 +110,12 @@ time_t ICACHE_FLASH_ATTR NtpClient::getNtpTime() {
             time_t        UnixUTCtime  = (highWord << 16 | lowWord) - 2208988800UL;
             time_t        adjustedtime = (*tz).toLocal(UnixUTCtime, &tcr);
 
-            myESP.myDebug("[NTP] UTC internet time is %d/%d %02d:%02d:%02d. System time set to local timezone which is %02d:%02d:%02d %s\n",
-                          to_day(UnixUTCtime),
-                          to_month(UnixUTCtime),
+            myESP.myDebug("[NTP] Internet time: %02d:%02d:%02d UTC on %d/%d. Local time: %02d:%02d:%02d %s",
                           to_hour(UnixUTCtime),
                           to_minute(UnixUTCtime),
                           to_second(UnixUTCtime),
+                          to_day(UnixUTCtime),
+                          to_month(UnixUTCtime),
                           to_hour(adjustedtime),
                           to_minute(adjustedtime),
                           to_second(adjustedtime),
diff --git a/src/Ntp.h b/src/Ntp.h
index 92f5cf680..078e04bc6 100644
--- a/src/Ntp.h
+++ b/src/Ntp.h
@@ -13,9 +13,9 @@
 #include "TimeLib.h" // customized version of the Time library
 #include "Timezone.h"
 
-#define NTP_PACKET_SIZE 48 // NTP time is in the first 48 bytes of the message
+#define NTP_PACKET_SIZE 48      // NTP time is in the first 48 bytes of the message
 #define NTP_INTERVAL_DEFAULT 60 // every hour
-#define NTP_TIMEZONE_DEFAULT 2 // CE
+#define NTP_TIMEZONE_DEFAULT 2  // CE
 #define NTP_TIMEZONE_MAX 11
 
 class NtpClient {
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 969a50eff..840256de2 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -34,7 +34,7 @@
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
-#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00             // WW OneTime loading
+#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00            // WW OneTime loading
 #define EMS_OFFSET_UBAParameterWW_wwComfort 9               // WW is in comfort or eco mode
 #define EMS_VALUE_UBAParameterWW_wwComfort_Hot 0x00         // the value for hot
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8         // the value for eco