diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index 862162a0..74702441 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -58,7 +58,7 @@ public:
     void performControlOperation() override;
 
     /**
-     * Generate a file containing the chip lock/unlock states inside /tmp/chip_status.txt
+     * Generate a file containing the chip lock/unlock states inside /tmp/chip_prot_status.txt
      * @return
      */
     static ReturnValue_t generateChipStateFile();
@@ -68,11 +68,11 @@ public:
     ReturnValue_t updateProtInfo(bool regenerateChipStateFile = true);
 
     /**
-     * Checks whether the target chip and copy are writeprotected and protect them if they are
-     * not
+     * Checks whether the target chip and copy are write protected and protect set them to a target
+     * state where applicable.
      * @param targetChip
      * @param targetCopy
-     * @param protect
+     * @param protect       Target state
      * @param protOperationPerformed [out] Can be used to determine whether any operation
      * was performed
      * @param updateProtFile Specify whether the protection info file is updated
@@ -145,6 +145,7 @@ private:
      * Index 3: Chip 1 Copy 1
      */
     std::array<bool, 4> protArray;
+    PeriodicOperationDivider opDivider;
 
     ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
             LocalDataPoolManager& poolManager) override;
@@ -172,7 +173,6 @@ private:
             const uint8_t *data, size_t size);
     ReturnValue_t actionPerformReboot(const uint8_t *data, size_t size);
 
-    PeriodicOperationDivider opDivider;
     void performWatchdogControlOperation();
 
     ReturnValue_t handleProtInfoUpdateLine(std::string nextLine);