diff --git a/openrouter/src/OpenRouter/OpenRouter.cpp b/openrouter/src/OpenRouter/OpenRouter.cpp
index 01ebd22..7a562b5 100644
--- a/openrouter/src/OpenRouter/OpenRouter.cpp
+++ b/openrouter/src/OpenRouter/OpenRouter.cpp
@@ -1,4 +1,9 @@
 #include "OpenRouter.hpp"
+#include <colors.h>
+#include "../settings/settings.hpp"
+#include "../system/system.hpp"
+#include <syslog.h>
+#include "../security/cors.hpp"
 
 OpenRouter::OpenRouter() {
     this->srv.Post("/api/settings/telnet/get", settings::get_telnet);
@@ -45,11 +50,9 @@ OpenRouter::OpenRouter() {
     this->srv.set_mount_point("/css", "../src/web/css");
 }
 
-OpenRouter::~OpenRouter() {
-    
-}
+OpenRouter::~OpenRouter() = default;
 
-int OpenRouter::serve(const std::string ip, int port, int socket_flags) {
+int OpenRouter::serve(const std::string *ip, int port, int socket_flags) {
     std::cout << GREEN << "Starting" << RESET << " server on [ " << YELLOW
             << "0.0.0.0" << RESET << ":" << CYAN << "43244" << RESET << " ]" << std::endl;
 
diff --git a/openrouter/src/OpenRouter/OpenRouter.hpp b/openrouter/src/OpenRouter/OpenRouter.hpp
index e1dc2c1..a0f6b51 100644
--- a/openrouter/src/OpenRouter/OpenRouter.hpp
+++ b/openrouter/src/OpenRouter/OpenRouter.hpp
@@ -3,13 +3,8 @@
 
 #include <iostream>
 #include <httplib.h>
-#include <colors.h>
-#include "../settings/settings.hpp"
-#include "../system/system.hpp"
-#include <syslog.h>
 
 #define CORS_ENABLE
-#include "../security/cors.hpp"
 
 class OpenRouter {
     private:
@@ -18,7 +13,7 @@ class OpenRouter {
     public:
         OpenRouter();
         ~OpenRouter();
-        int serve(const std::string ip, int port, int socket_flags = 0);
+        int serve(const std::string *ip, int port, int socket_flags = 0);
 };
 
 #endif // OPENROUTER_HPP
\ No newline at end of file
diff --git a/openrouter/src/auth/auth.cpp b/openrouter/src/auth/auth.cpp
index 8ea8405..c768759 100644
--- a/openrouter/src/auth/auth.cpp
+++ b/openrouter/src/auth/auth.cpp
@@ -5,12 +5,12 @@
 #include <json.hpp>
 #include "../types.hpp"
 
-bool authenticate(std::string token) {
+bool authenticate(const std::string &token) {
     httplib::Client cli(AUTH_SERVICE);
 
     std::stringstream body;
     body <<  R"({"token":")" << token << R"("})";
-    httplib::Result res = cli.Post("/api/access", body.str().c_str(), JSON_TYPE);
+    httplib::Result res = cli.Post("/api/access", body.str(), JSON_TYPE);
     if (res->status == httplib::OK_200) {
         nlohmann::json resjson = nlohmann::json::parse(res->body);
         if (resjson["access"] == "reject") {
diff --git a/openrouter/src/auth/auth.hpp b/openrouter/src/auth/auth.hpp
index 86c992d..c83f125 100644
--- a/openrouter/src/auth/auth.hpp
+++ b/openrouter/src/auth/auth.hpp
@@ -3,6 +3,6 @@
 
 #include <iostream>
 
-bool authenticate(std::string token);
+bool authenticate(const std::string token);
 
 #endif // AUTH_HPP
\ No newline at end of file
diff --git a/openrouter/src/settings/dns/enabled.cpp b/openrouter/src/settings/dns/enabled.cpp
index e96e2bb..903e41a 100644
--- a/openrouter/src/settings/dns/enabled.cpp
+++ b/openrouter/src/settings/dns/enabled.cpp
@@ -1,7 +1,6 @@
 #include "dns.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
diff --git a/openrouter/src/settings/dns/local_domains.cpp b/openrouter/src/settings/dns/local_domains.cpp
index a4914f5..60064aa 100644
--- a/openrouter/src/settings/dns/local_domains.cpp
+++ b/openrouter/src/settings/dns/local_domains.cpp
@@ -1,7 +1,6 @@
 #include "dns.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
@@ -31,7 +30,7 @@ namespace settings {
             while (!domainsfile.eof()) {
                 domainsfile >> ip_string;
                 domainsfile >> domain_string;
-                if (domain_string == "") {
+                if (domain_string.empty()) {
                     continue;
                 }
                 responsedata << R"({"ip":")" << ip_string << R"(","domain":")" << domain_string << R"("},)";
diff --git a/openrouter/src/settings/dns/servers.cpp b/openrouter/src/settings/dns/servers.cpp
index fac9eca..e38c5a8 100644
--- a/openrouter/src/settings/dns/servers.cpp
+++ b/openrouter/src/settings/dns/servers.cpp
@@ -1,7 +1,6 @@
 #include "dns.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
@@ -62,9 +61,9 @@ namespace settings {
         if (authenticate(json_body["token"])) {
             std::ofstream dnsserversfile("/etc/dnsmasq.conf.d/resolv.conf");
             nlohmann::json servers = json_body["servers"];
-            for (nlohmann::json_abi_v3_11_3::json server : servers) {
+            for (const nlohmann::json_abi_v3_11_3::json server : servers) {
                 std::string srv = server;
-                if (server == "") {
+                if (server.empty()) {
                     continue;
                 }
                 dnsserversfile << "nameserver " << srv << "\n";
diff --git a/openrouter/src/settings/ftp/ftp.cpp b/openrouter/src/settings/ftp/ftp.cpp
index fa9399f..9a39348 100644
--- a/openrouter/src/settings/ftp/ftp.cpp
+++ b/openrouter/src/settings/ftp/ftp.cpp
@@ -1,7 +1,6 @@
 #include "ftp.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
diff --git a/openrouter/src/settings/ssh/keys.cpp b/openrouter/src/settings/ssh/keys.cpp
index c96cbad..6543f3b 100644
--- a/openrouter/src/settings/ssh/keys.cpp
+++ b/openrouter/src/settings/ssh/keys.cpp
@@ -1,7 +1,6 @@
 #include "ssh.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
@@ -30,7 +29,7 @@ namespace settings {
             std::string key_string = "";
             int iter = 0;
             while (std::getline(keysfile, key_string)) {
-                if (key_string == "") {
+                if (key_string.empty()) {
                     continue;
                 }
                 responsedata << R"(")" << key_string << R"(",)";
diff --git a/openrouter/src/settings/ssh/port.cpp b/openrouter/src/settings/ssh/port.cpp
index cdc2c3b..fa4c63f 100644
--- a/openrouter/src/settings/ssh/port.cpp
+++ b/openrouter/src/settings/ssh/port.cpp
@@ -1,7 +1,6 @@
 #include "ssh.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/ssh/status.cpp b/openrouter/src/settings/ssh/status.cpp
index d812a81..c69bf6a 100644
--- a/openrouter/src/settings/ssh/status.cpp
+++ b/openrouter/src/settings/ssh/status.cpp
@@ -1,7 +1,6 @@
 #include "ssh.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
diff --git a/openrouter/src/settings/telnet/enabled.cpp b/openrouter/src/settings/telnet/enabled.cpp
index ae4b5f2..46c8ad0 100644
--- a/openrouter/src/settings/telnet/enabled.cpp
+++ b/openrouter/src/settings/telnet/enabled.cpp
@@ -1,7 +1,6 @@
 #include "telnet.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/telnet/port.cpp b/openrouter/src/settings/telnet/port.cpp
index 702bf39..3833e88 100644
--- a/openrouter/src/settings/telnet/port.cpp
+++ b/openrouter/src/settings/telnet/port.cpp
@@ -1,7 +1,6 @@
 #include "telnet.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/wifi/channel.cpp b/openrouter/src/settings/wifi/channel.cpp
index 0e9024b..1734205 100644
--- a/openrouter/src/settings/wifi/channel.cpp
+++ b/openrouter/src/settings/wifi/channel.cpp
@@ -1,7 +1,6 @@
 #include "wifi.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/wifi/name.cpp b/openrouter/src/settings/wifi/name.cpp
index 4fd844a..5825ee6 100644
--- a/openrouter/src/settings/wifi/name.cpp
+++ b/openrouter/src/settings/wifi/name.cpp
@@ -1,7 +1,6 @@
 #include "wifi.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/wifi/password.cpp b/openrouter/src/settings/wifi/password.cpp
index 5daa58a..aacd82b 100644
--- a/openrouter/src/settings/wifi/password.cpp
+++ b/openrouter/src/settings/wifi/password.cpp
@@ -1,7 +1,6 @@
 #include "wifi.hpp"
 #include <colors.h>
 #include "../../types.hpp"
-#include "../../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/openrouter/src/settings/wifi/qr.cpp b/openrouter/src/settings/wifi/qr.cpp
index b8f1028..bfe3605 100644
--- a/openrouter/src/settings/wifi/qr.cpp
+++ b/openrouter/src/settings/wifi/qr.cpp
@@ -1,7 +1,6 @@
 #include "wifi.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <QR-Code-generator/qrcodegen.hpp>
 #include <QR-Code-generator/qrtosvg.hpp>
diff --git a/openrouter/src/settings/wifi/status.cpp b/openrouter/src/settings/wifi/status.cpp
index 76e76b0..3b924bf 100644
--- a/openrouter/src/settings/wifi/status.cpp
+++ b/openrouter/src/settings/wifi/status.cpp
@@ -1,7 +1,6 @@
 #include "wifi.hpp"
 #include <colors.h>
 #include <json.hpp>
-#include "../../routes.hpp"
 #include "../../types.hpp"
 #include <syslog.h>
 #include "../../auth/auth.hpp"
diff --git a/openrouter/src/system/reboot/reboot.cpp b/openrouter/src/system/reboot/reboot.cpp
index 7d960e3..9e746b1 100644
--- a/openrouter/src/system/reboot/reboot.cpp
+++ b/openrouter/src/system/reboot/reboot.cpp
@@ -1,6 +1,5 @@
 #include "reboot.hpp"
 #include <json.hpp>
-#include "../routes.hpp"
 #include <colors.h>
 #include "../types.hpp"
 #include "../../auth/auth.hpp"
diff --git a/openrouter/src/system/syslog/syslog.cpp b/openrouter/src/system/syslog/syslog.cpp
index 4480485..c956ae6 100644
--- a/openrouter/src/system/syslog/syslog.cpp
+++ b/openrouter/src/system/syslog/syslog.cpp
@@ -1,7 +1,5 @@
 #include "syslog.hpp"
-#include <colors.h>
 #include "../types.hpp"
-#include "../routes.hpp"
 #include <json.hpp>
 #include <iostream>
 #include <sstream>