diff --git a/bsp_q7s/InitMission.cpp b/bsp_q7s/InitMission.cpp
index a3d0c0dc..72240c5b 100644
--- a/bsp_q7s/InitMission.cpp
+++ b/bsp_q7s/InitMission.cpp
@@ -31,8 +31,8 @@ ServiceInterfaceStream sif::error("ERROR", true, false, true);
 ObjectManagerIF *objectManager = nullptr;
 
 void initmission::initMission() {
-	sif::info << "Building global objects.." << std::endl;
-	/* Instantiate global object manager and also create all objects */
+    sif::info << "Building global objects.." << std::endl;
+    /* Instantiate global object manager and also create all objects */
     objectManager = new ObjectManager(ObjectFactory::produce);
     sif::info << "Initializing all objects.." << std::endl;
     objectManager->initialize();
@@ -53,18 +53,18 @@ void initmission::initTasks() {
     void (*missedDeadlineFunc) (void) = nullptr;
 #endif
 
-	/* TMTC Distribution */
-	PeriodicTaskIF* tmTcDistributor = factory->createPeriodicTask(
-	        "DIST", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
-	ReturnValue_t result = tmTcDistributor->addComponent(
-			objects::CCSDS_PACKET_DISTRIBUTOR);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-	    initmission::printAddObjectError("CCSDS_DISTRIB", objects::CCSDS_PACKET_DISTRIBUTOR);
-	}
-	result = tmTcDistributor->addComponent(objects::PUS_PACKET_DISTRIBUTOR);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    /* TMTC Distribution */
+    PeriodicTaskIF* tmTcDistributor = factory->createPeriodicTask(
+            "DIST", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+    ReturnValue_t result = tmTcDistributor->addComponent(
+            objects::CCSDS_PACKET_DISTRIBUTOR);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        initmission::printAddObjectError("CCSDS_DISTRIB", objects::CCSDS_PACKET_DISTRIBUTOR);
+    }
+    result = tmTcDistributor->addComponent(objects::PUS_PACKET_DISTRIBUTOR);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_PACKET_DISTRIB", objects::PUS_PACKET_DISTRIBUTOR);
-	}
+    }
     result = tmTcDistributor->addComponent(objects::TM_FUNNEL);
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("TM_FUNNEL", objects::TM_FUNNEL);
@@ -72,7 +72,7 @@ void initmission::initTasks() {
 
     /* UDP bridge */
     PeriodicTaskIF* udpBridgeTask = factory->createPeriodicTask(
-    		"UDP_UNIX_BRIDGE", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+            "UDP_UNIX_BRIDGE", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
     result = udpBridgeTask->addComponent(objects::UDP_BRIDGE);
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("UDP_BRIDGE", objects::UDP_BRIDGE);
@@ -84,81 +84,81 @@ void initmission::initTasks() {
         initmission::printAddObjectError("UDP_POLLING", objects::UDP_POLLING_TASK);
     }
 
-	/* PUS Services */
-	PeriodicTaskIF* pusVerification = factory->createPeriodicTask(
-	        "PUS_VERIF", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
-	result = pusVerification->addComponent(objects::PUS_SERVICE_1_VERIFICATION);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    /* PUS Services */
+    PeriodicTaskIF* pusVerification = factory->createPeriodicTask(
+            "PUS_VERIF", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
+    result = pusVerification->addComponent(objects::PUS_SERVICE_1_VERIFICATION);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_VERIF", objects::PUS_SERVICE_1_VERIFICATION);
-	}
+    }
 
-	PeriodicTaskIF* pusEvents = factory->createPeriodicTask(
-	        "PUS_EVENTS", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
-	result = pusVerification->addComponent(objects::PUS_SERVICE_5_EVENT_REPORTING);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    PeriodicTaskIF* pusEvents = factory->createPeriodicTask(
+            "PUS_EVENTS", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
+    result = pusVerification->addComponent(objects::PUS_SERVICE_5_EVENT_REPORTING);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_EVENTS", objects::PUS_SERVICE_5_EVENT_REPORTING);
-	}
+    }
 
-	PeriodicTaskIF* pusHighPrio = factory->createPeriodicTask(
-	        "PUS_HIGH_PRIO", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
-	result = pusHighPrio->addComponent(objects::PUS_SERVICE_2_DEVICE_ACCESS);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    PeriodicTaskIF* pusHighPrio = factory->createPeriodicTask(
+            "PUS_HIGH_PRIO", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);
+    result = pusHighPrio->addComponent(objects::PUS_SERVICE_2_DEVICE_ACCESS);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_2", objects::PUS_SERVICE_2_DEVICE_ACCESS);
-	}
-	result = pusHighPrio->addComponent(objects::PUS_SERVICE_9_TIME_MGMT);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    }
+    result = pusHighPrio->addComponent(objects::PUS_SERVICE_9_TIME_MGMT);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_9", objects::PUS_SERVICE_9_TIME_MGMT);
-	}
+    }
 
-	PeriodicTaskIF* pusMedPrio = factory->createPeriodicTask(
-	        "PUS_MED_PRIO", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc);
-	result = pusMedPrio->addComponent(objects::PUS_SERVICE_8_FUNCTION_MGMT);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    PeriodicTaskIF* pusMedPrio = factory->createPeriodicTask(
+            "PUS_MED_PRIO", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc);
+    result = pusMedPrio->addComponent(objects::PUS_SERVICE_8_FUNCTION_MGMT);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_8", objects::PUS_SERVICE_8_FUNCTION_MGMT);
-	}
-	result = pusMedPrio->addComponent(objects::PUS_SERVICE_200_MODE_MGMT);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    }
+    result = pusMedPrio->addComponent(objects::PUS_SERVICE_200_MODE_MGMT);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_200", objects::PUS_SERVICE_200_MODE_MGMT);
-	}
-	result = pusMedPrio->addComponent(objects::PUS_SERVICE_20_PARAMETERS);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-	    initmission::printAddObjectError("PUS_20", objects::PUS_SERVICE_20_PARAMETERS);
-	}
+    }
+    result = pusMedPrio->addComponent(objects::PUS_SERVICE_20_PARAMETERS);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        initmission::printAddObjectError("PUS_20", objects::PUS_SERVICE_20_PARAMETERS);
+    }
 
-	PeriodicTaskIF* pusLowPrio = factory->createPeriodicTask(
-	        "PUS_LOW_PRIO", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.6, missedDeadlineFunc);
-	result = pusLowPrio->addComponent(objects::PUS_SERVICE_17_TEST);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
+    PeriodicTaskIF* pusLowPrio = factory->createPeriodicTask(
+            "PUS_LOW_PRIO", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.6, missedDeadlineFunc);
+    result = pusLowPrio->addComponent(objects::PUS_SERVICE_17_TEST);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS_17", objects::PUS_SERVICE_17_TEST);
-	}
+    }
 
-	//TODO: Add handling of missed deadlines
-	/* Polling Sequence Table Default */
-	FixedTimeslotTaskIF * pollingSequenceTableTaskDefault = factory->createFixedTimeslotTask(
-	        "PST_TASK_DEFAULT", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 3.0,
-	        missedDeadlineFunc);
-	result = pst::pollingSequenceInitDefault(pollingSequenceTableTaskDefault);
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
-	}
+    //TODO: Add handling of missed deadlines
+    /* Polling Sequence Table Default */
+    FixedTimeslotTaskIF * pollingSequenceTableTaskDefault = factory->createFixedTimeslotTask(
+            "PST_TASK_DEFAULT", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 3.0,
+            missedDeadlineFunc);
+    result = pst::pollingSequenceInitDefault(pollingSequenceTableTaskDefault);
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+        sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+    }
 
 #if TE0720 == 0
-	FixedTimeslotTaskIF* gomSpacePstTask = factory->
-			createFixedTimeslotTask("GS_PST_TASK", 50,
-					PeriodicTaskIF::MINIMUM_STACK_SIZE*8, 3.0, missedDeadlineFunc);
-	result = pst::gomspacePstInit(gomSpacePstTask);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-		sif::error << "InitMission::initTasks: GomSpace PST initialization failed!" << std::endl;
-	}
+    FixedTimeslotTaskIF* gomSpacePstTask = factory->
+            createFixedTimeslotTask("GS_PST_TASK", 50,
+                    PeriodicTaskIF::MINIMUM_STACK_SIZE*8, 3.0, missedDeadlineFunc);
+    result = pst::gomspacePstInit(gomSpacePstTask);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        sif::error << "InitMission::initTasks: GomSpace PST initialization failed!" << std::endl;
+    }
 #endif
 
-	PeriodicTaskIF* testTask = factory->createPeriodicTask(
-	        "GPIOD_TEST", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1, missedDeadlineFunc);
+    PeriodicTaskIF* testTask = factory->createPeriodicTask(
+            "GPIOD_TEST", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1, missedDeadlineFunc);
 #if OBSW_ADD_TEST_CODE == 1
-	result = testTask->addComponent(objects::TEST_TASK);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-	    initmission::printAddObjectError("TEST_TASK", objects::TEST_TASK);
-	}
+    result = testTask->addComponent(objects::TEST_TASK);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        initmission::printAddObjectError("TEST_TASK", objects::TEST_TASK);
+    }
 #endif /* OBSW_ADD_TEST_CODE == 1 */
 #if TE0720 == 1 && TEST_LIBGPIOD == 1
     result = testTask->addComponent(objects::LIBGPIOD_TEST);
@@ -167,22 +167,22 @@ void initmission::initTasks() {
     }
 #endif /* TE0720 == 1 && TEST_LIBGPIOD == 1 */
 
-	sif::info << "Starting tasks.." << std::endl;
-	tmTcDistributor->startTask();
-	udpBridgeTask->startTask();
-	udpPollingTask->startTask();
+    sif::info << "Starting tasks.." << std::endl;
+    tmTcDistributor->startTask();
+    udpBridgeTask->startTask();
+    udpPollingTask->startTask();
 
 #if TE0720 == 0
-	gomSpacePstTask->startTask();
+    gomSpacePstTask->startTask();
 #endif
-	pollingSequenceTableTaskDefault->startTask();
+    pollingSequenceTableTaskDefault->startTask();
 
-	pusVerification->startTask();
-	pusEvents->startTask();
-	pusHighPrio->startTask();
-	pusMedPrio->startTask();
-	pusLowPrio->startTask();
+    pusVerification->startTask();
+    pusEvents->startTask();
+    pusHighPrio->startTask();
+    pusMedPrio->startTask();
+    pusLowPrio->startTask();
 
-	testTask->startTask();
-	sif::info << "Tasks started.." << std::endl;
+    testTask->startTask();
+    sif::info << "Tasks started.." << std::endl;
 }
diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index d69683ef..6a3b16bc 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -158,10 +158,10 @@ void ObjectFactory::produce(){
 
     GpioCookie* solarArrayDeplCookie = new GpioCookie;
     GpiodRegular gpioConfigDeplSA1(std::string("gpiochip7"), 25,
-                std::string("DeplSA1"), gpio::OUT, 0);
+            std::string("DeplSA1"), gpio::OUT, 0);
     solarArrayDeplCookie->addGpio(gpioIds::DEPLSA1, gpioConfigDeplSA1);
     GpiodRegular gpioConfigDeplSA2(std::string("gpiochip7"), 23,
-                std::string("DeplSA2"), gpio::OUT, 0);
+            std::string("DeplSA2"), gpio::OUT, 0);
     solarArrayDeplCookie->addGpio(gpioIds::DEPLSA2, gpioConfigDeplSA2);
 
     //TODO: Find out burn time. For now set to 1000 ms.