Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -r2140a55e7bba381ec3b62aa2af47b967c8adaa31
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 2140a55e7bba381ec3b62aa2af47b967c8adaa31)
@@ -78,10 +78,10 @@
  *************************************************************************/
 void initSafetyShutdown( void )
 {
-    safetyShutdownActivated = FALSE;
+    safetyShutdownActivated          = FALSE;
     safetyShutdownOverrideResetState = FALSE;
-    safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_START;
-    safetyShutdownSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
+    safetyShutdownSelfTestState      = SAFETY_SHUTDOWN_SELF_TEST_STATE_START;
+    safetyShutdownSelfTestStatus     = SELF_TEST_STATUS_IN_PROGRESS;
     safetyShutdownSelfTestTimerCount = 0;
     CLR_SAFETY_SHUTDOWN();
 }
@@ -128,20 +128,22 @@
     switch ( safetyShutdownSelfTestState )
     {
         case SAFETY_SHUTDOWN_SELF_TEST_STATE_START:
+        {
             safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS;
 #ifndef DISABLE_WD_AND_SFTY_POST_TESTS
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
 
                 // Verify 24V is up
                 if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_INITIAL, v24 );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_INITIAL, v24 )
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
 #endif
             safetyShutdownSelfTestTimerCount = getMSTimerCount();
             activateSafetyShutdown();
-            break;
+        }
+        break;
 
         case SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS:
             if ( TRUE == didTimeout( safetyShutdownSelfTestTimerCount, SAFETY_SHUTDOWN_POST_TIMEOUT_MS ) )
@@ -153,7 +155,7 @@
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_NOT_CUT, v24 );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_NOT_CUT, v24 )
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
 #endif
@@ -174,7 +176,7 @@
                 // Verify 24V is down when w.d. recovered
                 if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_24V_RESTORE, v24 );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_24V_RESTORE, v24 )
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
                 else