diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ce19479..8a8055bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -490,8 +490,8 @@ endif()
 # ##############################################################################
 
 # Add libraries
-target_link_libraries(${LIB_EIVE_MISSION}
-                      PUBLIC ${LIB_FSFW_NAME} ${LIB_OS_NAME})
+target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_FSFW_NAME}
+                                                 ${LIB_OS_NAME})
 
 target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME})
 
diff --git a/linux/boardtest/UartTestClass.h b/linux/boardtest/UartTestClass.h
index 6cb0d31c..fd20e621 100644
--- a/linux/boardtest/UartTestClass.h
+++ b/linux/boardtest/UartTestClass.h
@@ -59,7 +59,7 @@ class UartTestClass : public TestTask {
   DleEncoder dleEncoder = DleEncoder();
   SerialCookie* uartCookie = nullptr;
   size_t encodedLen = 0;
-  //lwgps_t gpsData = {};
+  // lwgps_t gpsData = {};
   struct termios tty = {};
   int serialPort = 0;
   bool startFound = false;
diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index 062bf7e7..d8df8e9a 100644
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -1,12 +1,11 @@
 #include "pollingSequenceFactory.h"
 
-#include "OBSWConfig.h"
-
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 
+#include "OBSWConfig.h"
 #include "eive/definitions.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index cb8658bc..77c826fd 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -39,10 +39,7 @@ SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() = default;
 ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) {
   using namespace std::filesystem;
 #if OBSW_THREAD_TRACING == 1
-  opCounter++;
-  if (opCounter % 5 == 0) {
-    sif::debug << "SA DEPL task running" << std::endl;
-  }
+  trace::threadTrace(opCounter, "SA DEPL");
 #endif
   if (opDivider.checkAndIncrement()) {
     auto activeSdc = sdcMan.getActiveSdCard();
diff --git a/test/TestTask.cpp b/test/TestTask.cpp
index 33af5494..2c6cb015 100644
--- a/test/TestTask.cpp
+++ b/test/TestTask.cpp
@@ -42,10 +42,8 @@ ReturnValue_t EiveTestTask::performOperation(uint8_t operationCode) {
 
 #include <etl/vector.h>
 
-
 // #include <lwgps/lwgps.h>
 
-
 /**
  * @brief           Dummy data from GPS receiver. Will be replaced witgh hyperion data later.
  */
@@ -76,7 +74,6 @@ const char hyperion_gps_data[] =
     "$GNVTG,040.7,T,,M,000.0,N,000.0,K,A*10\r\n"
     "$GNZDA,173225.998892,27,02,2021,00,00*75\r\n";
 
-
 ReturnValue_t EiveTestTask::performOneShotAction() {
 #if OBSW_ADD_TEST_CODE == 1
   // performLwgpsTest();