diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp
index 19df002f..2e73bbf5 100644
--- a/bsp_hosted/scheduling.cpp
+++ b/bsp_hosted/scheduling.cpp
@@ -185,7 +185,7 @@ void scheduling::initTasks() {
 #endif /* OBSW_ADD_TEST_CODE == 1 */
 
   PeriodicTaskIF* dummyTask = factory->createPeriodicTask(
-		  "DUMMY_TASK", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
+      "DUMMY_TASK", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
   dummyTask->addComponent(objects::SUS_0_N_LOC_XFYFZM_PT_XF);
   dummyTask->addComponent(objects::SUS_1_N_LOC_XBYFZM_PT_XB);
   dummyTask->addComponent(objects::SUS_2_N_LOC_XFYBZB_PT_YB);
diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/devices/devicedefinitions/GPSDefinitions.h
index 7653745f..387d08be 100644
--- a/mission/devices/devicedefinitions/GPSDefinitions.h
+++ b/mission/devices/devicedefinitions/GPSDefinitions.h
@@ -1,9 +1,9 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
 
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/datapoollocal/StaticLocalDataSet.h"
 #include "fsfw/devicehandlers/DeviceHandlerIF.h"
-#include "eive/eventSubsystemIds.h"
 
 namespace GpsHyperion {
 
diff --git a/unittest/controller/testThermalController.cpp b/unittest/controller/testThermalController.cpp
index 1c5f63fe..44fba918 100644
--- a/unittest/controller/testThermalController.cpp
+++ b/unittest/controller/testThermalController.cpp
@@ -13,7 +13,7 @@ TEST_CASE("Thermal Controller", "[ThermalController]") {
   const object_id_t THERMAL_CONTROLLER_ID = 0x123;
 
   new TemperatureSensorsDummy();
-  //new SusDummy();
+  // new SusDummy();
 
   // testEnvironment::initialize();