diff --git a/Platformio/HAL/Targets/Simulator/HardwareSimulator.cpp b/Platformio/HAL/Targets/Simulator/HardwareSimulator.cpp
index d7b4c1f..3e4c349 100644
--- a/Platformio/HAL/Targets/Simulator/HardwareSimulator.cpp
+++ b/Platformio/HAL/Targets/Simulator/HardwareSimulator.cpp
@@ -14,13 +14,11 @@ HardwareSimulator::HardwareSimulator(): HardwareAbstract(),
         while(true){
             std::this_thread::sleep_for(std::chrono::milliseconds(2));
             lv_tick_inc(2); /*Tell lvgl that 2 milliseconds were elapsed*/
-    }})
-{
-    mBattery = std::make_shared<BatterySimulator>();
-    mDisplay = SDLDisplay::getInstance();
-    mWifiHandler = std::make_shared<wifiHandlerSim>();
-    
-}
+    }}),
+    mBattery(std::make_shared<BatterySimulator>()),
+    mDisplay(SDLDisplay::getInstance()),
+    mWifiHandler(std::make_shared<wifiHandlerSim>())
+{}
 
 std::shared_ptr<BatteryInterface> HardwareSimulator::battery(){
     return mBattery;