diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 961828966..55f47144f 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -2658,7 +2658,7 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload) {
     // myDebug("Publish [#%d] %s (%d) %s (%d)", logCount, topic, strlen(topic), payload, strlen(payload)); // for debugging
 
     // find the topic
-    while ((_hasValue(MQTT_log[logPointer].topic) && logPointer < MYESP_MQTTLOG_MAX)) {
+    while ((logPointer < MYESP_MQTTLOG_MAX) && (_hasValue(MQTT_log[logPointer].topic))) {
         if (strcmp(MQTT_log[logPointer].topic, topic) == 0) {
             found = true;
             break;
diff --git a/src/TelnetSpy.cpp b/src/TelnetSpy.cpp
index 6a44f83c0..274749d9d 100644
--- a/src/TelnetSpy.cpp
+++ b/src/TelnetSpy.cpp
@@ -573,8 +573,7 @@ void TelnetSpy::handle() {
         return;
     }
     if (!listening) {
-        
-        if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
+                if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
             if (usedSer) {
                 usedSer->println("[TELNET] in AP mode"); // added by Proddy
             }
diff --git a/src/TimeLib.cpp b/src/TimeLib.cpp
index e56de4097..62da04d5b 100644
--- a/src/TimeLib.cpp
+++ b/src/TimeLib.cpp
@@ -105,28 +105,28 @@ void refreshCache(time_t t) {
 }
 
 int day(time_t t) { // the day for the given time (0-6)
-  refreshCache(t);
-  return tm.Day;
+    refreshCache(t);
+    return tm.Day;
 }
 
-int month(time_t t) {  // the month for the given time
-  refreshCache(t);
-  return tm.Month;
+int month(time_t t) { // the month for the given time
+    refreshCache(t);
+    return tm.Month;
 }
 
-int second(time_t t) {  // the second for the given time
-  refreshCache(t);
-  return tm.Second;
+int second(time_t t) { // the second for the given time
+    refreshCache(t);
+    return tm.Second;
 }
 
 int minute(time_t t) { // the minute for the given time
-  refreshCache(t);
-  return tm.Minute;  
+    refreshCache(t);
+    return tm.Minute;
 }
 
 int hour(time_t t) { // the hour for the given time
-  refreshCache(t);
-  return tm.Hour;  
+    refreshCache(t);
+    return tm.Hour;
 }
 
 int year(time_t t) { // the year for the given time
@@ -140,4 +140,3 @@ void setTime(time_t t) {
     Status       = timeSet;
     prevMillis   = millis(); // restart counting from now (thanks to Korman for this fix)
 }
-