diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index cbfe8776..c5af74e4 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -43,6 +43,7 @@
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
 #include <dummies/TemperatureSensorsDummy.h>
+
 #include "dummies/helpers.h"
 #include "mission/utility/GlobalConfigHandler.h"
 
diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index ab16e5b3..690267d2 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -222,7 +222,7 @@ void initmission::initTasks() {
 #if OBSW_ADD_TCS_CTRL == 1
   tcsTask->addComponent(objects::THERMAL_CONTROLLER);
 #endif
-  
+
 #if OBSW_ADD_STAR_TRACKER == 1
   PeriodicTaskIF* strHelperTask = factory->createPeriodicTask(
       "STR_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index a30f9c37..b0b784ec 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -1,8 +1,5 @@
 #include "ObjectFactory.h"
 
-#include "mission/system/objects/AcsSubsystem.h"
-#include "linux/devices/ScexUartReader.h"
-
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
 #include "bsp_q7s/callbacks/gnssCallback.h"
@@ -24,6 +21,7 @@
 #include "linux/callbacks/gpioCallbacks.h"
 #include "linux/csp/CspComIF.h"
 #include "linux/devices/GPSHyperionLinuxController.h"
+#include "linux/devices/ScexUartReader.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
 #include "linux/devices/ploc/PlocMPSoCHandler.h"
@@ -43,6 +41,7 @@
 #include "mission/system/fdir/RtdFdir.h"
 #include "mission/system/fdir/SusFdir.h"
 #include "mission/system/fdir/SyrlinksFdir.h"
+#include "mission/system/objects/AcsSubsystem.h"
 #include "mission/system/objects/RwAssembly.h"
 #include "mission/system/objects/TcsBoardAssembly.h"
 #include "mission/system/tree/acsModeTree.h"
diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp
index 1d90ee0c..d6e80dc1 100644
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@@ -326,7 +326,7 @@ void ObjectFactory::createScexComponents(std::string uartDev, PowerSwitchIF* pwr
                                          std::optional<power::Switch_t> switchId) {
   auto* cookie = new UartCookie(objects::SCEX, uartDev, uart::SCEX_BAUD, 4096);
   cookie->setTwoStopBits();
-  //cookie->setParityEven();
+  // cookie->setParityEven();
   auto scexUartReader = new ScexUartReader(objects::SCEX_UART_READER);
   auto scexHandler = new ScexDeviceHandler(objects::SCEX, *scexUartReader, cookie, mountedIF);
   if (onImmediately) {
diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp
index a336f640..0b434c45 100644
--- a/mission/system/tree/acsModeTree.cpp
+++ b/mission/system/tree/acsModeTree.cpp
@@ -1,6 +1,6 @@
-#include <fsfw/container/FixedMap.h>
 #include "acsModeTree.h"
 
+#include <fsfw/container/FixedMap.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/subsystem/Subsystem.h>
@@ -386,9 +386,9 @@ void buildTargetPtSequence(Subsystem* ss, ModeListEntry& eh) {
 void checkInsert(ReturnValue_t result, const char* ctx) {
   if (result != returnvalue::OK) {
     sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx;
-    if(result == mapdefs::KEY_ALREADY_EXISTS) {
+    if (result == mapdefs::KEY_ALREADY_EXISTS) {
       sif::warning << ": Key already exists" << std::endl;
-    } else if(result == mapdefs::MAP_FULL) {
+    } else if (result == mapdefs::MAP_FULL) {
       sif::warning << ": Map full" << std::endl;
     } else {
       sif::warning << std::endl;