diff --git a/lib/PButton/PButon.cpp b/lib/PButton/PButon.cpp
index a19fe96df..28eb41f0f 100644
--- a/lib/PButton/PButon.cpp
+++ b/lib/PButton/PButon.cpp
@@ -54,7 +54,7 @@ bool PButton::init(uint8_t pin, bool pullMode) {
 
 #if defined(ESP32)
     pinMode(pin_, pullMode ? INPUT_PULLUP : INPUT_PULLDOWN);
-#else // esp8266 and standalone
+#else                                           // esp8266 and standalone
     pinMode(pin_, pullMode ? INPUT_PULLUP : INPUT);
 #endif
     enabled_ = (digitalRead(pin_) == pullMode); // see if a button is connected
diff --git a/lib/PButton/PButton.h b/lib/PButton/PButton.h
index 16899ff49..d7be73447 100644
--- a/lib/PButton/PButton.h
+++ b/lib/PButton/PButton.h
@@ -47,21 +47,21 @@ class PButton {
     bool    pullMode_;
     bool    enabled_;
 
-    bool state_;            // Value read from button
-    bool lastState_;        // Last value of button state
-    bool dblClickWaiting_;  // whether we're waiting for a double click (down)
-    bool dblClickOnNextUp_; // whether to register a double click on next release, or whether to wait and click
-    bool singleClickOK_;    // whether it's OK to do a single click
+    bool state_;              // Value read from button
+    bool lastState_;          // Last value of button state
+    bool dblClickWaiting_;    // whether we're waiting for a double click (down)
+    bool dblClickOnNextUp_;   // whether to register a double click on next release, or whether to wait and click
+    bool singleClickOK_;      // whether it's OK to do a single click
 
-    uint32_t downTime_; // time the button was pressed down
-    uint32_t upTime_;   // time the button was released
+    uint32_t downTime_;       // time the button was pressed down
+    uint32_t upTime_;         // time the button was released
 
     bool ignoreUP_;           // whether to ignore the button release because the click+hold was triggered
     bool waitForUP_;          // when held, whether to wait for the up event
     bool longPressHappened_;  // whether or not the hold event happened already
     bool vLongPressHappened_; // whether or not the long hold event happened already
 
-    bool buttonBusy_; // false if idle
+    bool buttonBusy_;         // false if idle
 
     buttonEventHandler cb_onClick, cb_onDblClick, cb_onLongPress, cb_onVLongPress;
 };
diff --git a/lib/uuid-common/src/get_uptime_ms.cpp b/lib/uuid-common/src/get_uptime_ms.cpp
index 48e5fe3c9..c995341e4 100644
--- a/lib/uuid-common/src/get_uptime_ms.cpp
+++ b/lib/uuid-common/src/get_uptime_ms.cpp
@@ -22,7 +22,6 @@
 
 namespace uuid {
 
-// added by proddy for EMS-ESP
 static uint64_t now_millis = 0;
 
 // returns system uptime in seconds
diff --git a/lib/uuid-common/src/loop.cpp b/lib/uuid-common/src/loop.cpp
index 389c52350..d4969cb8f 100644
--- a/lib/uuid-common/src/loop.cpp
+++ b/lib/uuid-common/src/loop.cpp
@@ -21,7 +21,7 @@
 namespace uuid {
 
 void loop() {
-    set_uptime(); // added by proddy
+    set_uptime();
 }
 
 } // namespace uuid
diff --git a/lib/uuid-common/src/uuid/common.h b/lib/uuid-common/src/uuid/common.h
index 6184ef971..ae0baee64 100644
--- a/lib/uuid-common/src/uuid/common.h
+++ b/lib/uuid-common/src/uuid/common.h
@@ -102,8 +102,8 @@ void loop();
  */
 uint64_t get_uptime_ms();
 
-uint32_t get_uptime();     // added by proddy for EMS-ESP
-uint32_t get_uptime_sec(); // added by proddy for EMS-ESP
+uint32_t get_uptime();     
+uint32_t get_uptime_sec(); 
 
 void set_uptime();
 
diff --git a/lib/uuid-console/src/shell_prompt.cpp b/lib/uuid-console/src/shell_prompt.cpp
index 576756296..a6130f1be 100644
--- a/lib/uuid-console/src/shell_prompt.cpp
+++ b/lib/uuid-console/src/shell_prompt.cpp
@@ -65,7 +65,6 @@ void Shell::display_prompt() {
         std::string context  = context_text();
 
         print(prompt_prefix());
-        // colors added by proddy
         if (!hostname.empty()) {
             print(COLOR_BRIGHT_GREEN);
             print(COLOR_BOLD_ON);
@@ -78,7 +77,6 @@ void Shell::display_prompt() {
             print(COLOR_BOLD_ON);
             print(context);
             print(COLOR_RESET);
-            // print(' ');
         }
         print(prompt_suffix());
         print(' ');
diff --git a/lib/uuid-syslog/src/syslog.cpp b/lib/uuid-syslog/src/syslog.cpp
index d97ca7540..313da45b6 100644
--- a/lib/uuid-syslog/src/syslog.cpp
+++ b/lib/uuid-syslog/src/syslog.cpp
@@ -365,7 +365,7 @@ bool SyslogService::can_transmit() {
 #endif
 
     if (!emsesp::EMSESP::system_.network_connected()) {
-        return false; // added by proddy. Check Ethernet
+        return false;
     }
 
     const uint64_t now           = uuid::get_uptime_ms();
diff --git a/lib_standalone/FS.h b/lib_standalone/FS.h
index c7a7b056d..d85355f22 100644
--- a/lib_standalone/FS.h
+++ b/lib_standalone/FS.h
@@ -61,11 +61,11 @@ class File : public Stream {
     bool seek(uint32_t pos) {
         return seek(pos, SeekSet);
     }
-    size_t       position() const;
-    size_t       size() const;
-    bool         setBufferSize(size_t size);
-    void         close();
-                 operator bool() const;
+    size_t position() const;
+    size_t size() const;
+    bool   setBufferSize(size_t size);
+    void   close();
+    operator bool() const;
     time_t       getLastWrite();
     const char * path() const;
     const char * name() const;
diff --git a/lib_standalone/Stream.h b/lib_standalone/Stream.h
index fad3ac00d..0153703be 100644
--- a/lib_standalone/Stream.h
+++ b/lib_standalone/Stream.h
@@ -91,7 +91,7 @@ class Stream : public Print {
     // initial characters that are not digits (or the minus sign) are skipped
     // integer is terminated by the first character that is not a digit.
 
-    float parseFloat(); // float version of parseInt
+    float parseFloat();                                    // float version of parseInt
 
     virtual size_t readBytes(char * buffer, size_t length) // read chars from stream into buffer
     {