diff --git a/linux/obc/PdecHandler.h b/linux/obc/PdecHandler.h
index 9924f173..401a07fd 100644
--- a/linux/obc/PdecHandler.h
+++ b/linux/obc/PdecHandler.h
@@ -225,9 +225,6 @@ class PdecHandler : public SystemObject,
 
   enum class State : uint8_t { INIT, RUNNING, WAIT_FOR_RECOVERY };
 
-  PdecPrintClcwAction pdecPrintClcwAction = PdecPrintClcwAction(this);
-  PdecPrintMonAction pdecPrintMonAction = PdecPrintMonAction(this);
-
   /**
    * @brief   Reads and handles messages stored in the commandQueue
    */
@@ -369,6 +366,9 @@ class PdecHandler : public SystemObject,
 
   ActionHelper actionHelper;
 
+  PdecPrintClcwAction pdecPrintClcwAction = PdecPrintClcwAction(this);
+  PdecPrintMonAction pdecPrintMonAction = PdecPrintMonAction(this);
+
   StorageManagerIF* tcStore = nullptr;
 
   MessageQueueIF* commandQueue = nullptr;
diff --git a/mission/devices/HeaterHandler.h b/mission/devices/HeaterHandler.h
index 386b55b4..eefa8a16 100644
--- a/mission/devices/HeaterHandler.h
+++ b/mission/devices/HeaterHandler.h
@@ -17,8 +17,8 @@
 #include <array>
 #include <vector>
 
-#include "devices/heaterSwitcherList.h"
 #include "devicedefinitions/HeaterDefinitions.h"
+#include "devices/heaterSwitcherList.h"
 
 class PowerSwitchIF;
 class HealthTableIF;
@@ -68,7 +68,7 @@ class HeaterHandler : public ExecutableObjectIF,
   MessageQueueId_t getCommandQueue() const override;
   ActionHelper* getActionHelper() override;
   ReturnValue_t executeAction(Action* action) override;
-  ReturnValue_t handleAction(SetHeaterAction *heaterAction);
+  ReturnValue_t handleAction(SetHeaterAction* heaterAction);
 
   ReturnValue_t initialize() override;
 
@@ -87,7 +87,6 @@ class HeaterHandler : public ExecutableObjectIF,
   static const MessageQueueId_t NO_COMMANDER = 0;
 
   enum SwitchState : bool { ON = true, OFF = false };
-  
 
   /**
    * @brief   Struct holding information about a heater command to execute.
@@ -136,13 +135,11 @@ class HeaterHandler : public ExecutableObjectIF,
   /** Switch number of the heater power supply switch */
   power::Switch_t mainLineSwitch;
 
-  SetHeaterAction setHeaterAction = SetHeaterAction(this);
-
   ActionHelper actionHelper;
 
-  StorageManagerIF* ipcStore = nullptr;
+  SetHeaterAction setHeaterAction = SetHeaterAction(this);
 
-  SetHeaterAction heaterAction = SetHeaterAction(this);
+  StorageManagerIF* ipcStore = nullptr;
 
   void readCommandQueue();
 
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index e6021e1a..8c362430 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -1,7 +1,6 @@
 #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
-#include "devicedefinitions/SolarArrayDeploymentDefinitions.h"
 #include <devices/powerSwitcherList.h>
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
@@ -15,6 +14,8 @@
 
 #include <unordered_map>
 
+#include "devicedefinitions/SolarArrayDeploymentDefinitions.h"
+
 /**
  * @brief	This class is used to control the solar array deployment.
  *
@@ -50,7 +51,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
   virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
 
   virtual MessageQueueId_t getCommandQueue() const override;
-  virtual ActionHelper *getActionHelper() override;
+  virtual ActionHelper* getActionHelper() override;
   virtual ReturnValue_t executeAction(Action* action) override;
   ReturnValue_t handleAction(SolarArrayDeploymentAction* action);
   virtual ReturnValue_t initialize() override;
@@ -127,11 +128,10 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   PowerSwitchIF* mainLineSwitcher = nullptr;
 
+  ActionHelper actionHelper;
 
   SolarArrayDeploymentAction deploymentAction = SolarArrayDeploymentAction(this);
 
-  ActionHelper actionHelper;
-
   void readCommandQueue();
 
   /**