diff --git a/lib/WebServerHandlers/DynamicPage.h b/lib/WebServerHandlers/DynamicPage.h
index 0ed3195..4ad7182 100644
--- a/lib/WebServerHandlers/DynamicPage.h
+++ b/lib/WebServerHandlers/DynamicPage.h
@@ -33,22 +33,16 @@ public:
   }
 
   #if defined(ARDUINO_ARCH_ESP32)
-  bool canHandle(WebServer &server, HTTPMethod method, const String uri) override {
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
     return this->canHandle(method, uri);
   }
-
-  bool canHandle(HTTPMethod method, const String uri) override {
-  #else
-  bool canHandle(HTTPMethod method, const String& uri) override {
   #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
     return uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
-  bool handle(WebServer& server, HTTPMethod method, const String uri) override {
-  #else
   bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
-  #endif
     if (!this->canHandle(method, uri)) {
       return false;
     }
diff --git a/lib/WebServerHandlers/StaticPage.h b/lib/WebServerHandlers/StaticPage.h
index 6be75d0..095635c 100644
--- a/lib/WebServerHandlers/StaticPage.h
+++ b/lib/WebServerHandlers/StaticPage.h
@@ -28,22 +28,16 @@ public:
   }
 
   #if defined(ARDUINO_ARCH_ESP32)
-  bool canHandle(WebServer &server, HTTPMethod method, const String uri) override {
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
     return this->canHandle(method, uri);
   }
-
-  bool canHandle(HTTPMethod method, const String uri) override {
-  #else
-  bool canHandle(HTTPMethod method, const String& uri) override {
   #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
     return method == HTTP_GET && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
-  bool handle(WebServer& server, HTTPMethod method, const String uri) override {
-  #else
   bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
-  #endif
     if (!this->canHandle(method, uri)) {
       return false;
     }
diff --git a/lib/WebServerHandlers/UpgradeHandler.h b/lib/WebServerHandlers/UpgradeHandler.h
index a6ae53e..13012cf 100644
--- a/lib/WebServerHandlers/UpgradeHandler.h
+++ b/lib/WebServerHandlers/UpgradeHandler.h
@@ -58,34 +58,26 @@ public:
   }
 
   #if defined(ARDUINO_ARCH_ESP32)
-  bool canHandle(WebServer &server, HTTPMethod method, const String uri) override {
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
     return this->canHandle(method, uri);
   }
-
-  bool canHandle(HTTPMethod method, const String uri) override {
-  #else
-  bool canHandle(HTTPMethod method, const String& uri) override {
   #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
     return method == HTTP_POST && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
   }
 
   #if defined(ARDUINO_ARCH_ESP32)
-  bool canUpload(WebServer &server, const String uri) override {
+  bool canUpload(WebServer &server, const String &uri) override {
     return this->canUpload(uri);
   }
-
-  bool canUpload(const String uri) override {
-  #else
-  bool canUpload(const String& uri) override {
   #endif
+
+  bool canUpload(const String& uri) override {
     return uri.equals(this->uri) && (!this->canUploadCallback || this->canUploadCallback(uri));
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
-  bool handle(WebServer& server, HTTPMethod method, const String uri) override {
-  #else
   bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
-  #endif
     if (this->afterUpgradeCallback) {
       this->afterUpgradeCallback(this->firmwareResult, this->filesystemResult);
     }
@@ -99,11 +91,7 @@ public:
     return true;
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
-  void upload(WebServer& server, const String uri, HTTPUpload& upload) override {
-  #else
   void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
-  #endif
     UpgradeResult* result;
     if (upload.name.equals("firmware")) {
       result = &this->firmwareResult;