diff --git a/Software/Software.cpp b/Software/Software.cpp
index dde1c9f3..73cdea2c 100644
--- a/Software/Software.cpp
+++ b/Software/Software.cpp
@@ -52,10 +52,10 @@ TaskHandle_t mqtt_loop_task;
 
 Logging logging;
 
-std::string mqtt_user; //TODO, move?
-std::string mqtt_password; //TODO, move?
-std::string http_username; //TODO, move?
-std::string http_password; //TODO, move?
+std::string mqtt_user;      //TODO, move?
+std::string mqtt_password;  //TODO, move?
+std::string http_username;  //TODO, move?
+std::string http_password;  //TODO, move?
 
 static std::list<Transmitter*> transmitters;
 void register_transmitter(Transmitter* transmitter) {
diff --git a/Software/USER_SETTINGS.cpp b/Software/USER_SETTINGS.cpp
index ccfa3e83..3581e093 100644
--- a/Software/USER_SETTINGS.cpp
+++ b/Software/USER_SETTINGS.cpp
@@ -29,8 +29,6 @@ std::string ssid;
 std::string password;
 std::string passwordAP;
 
-// MQTT
-
 const char* mqtt_topic_name =
     "BE";  // Custom MQTT topic name. Previously, the name was automatically set to "battery-emulator_esp32-XXXXXX"
 const char* mqtt_object_id_prefix =