Index: firmware/App/Services/StateServices/DrySelfTests.c
===================================================================
diff -u -r3c9078ec717dbc4dc6815d45794aacdf9bf6793e -r3f325a9fe7cbfb660a3ddf274d471d635266c586
--- firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision 3c9078ec717dbc4dc6815d45794aacdf9bf6793e)
+++ firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision 3f325a9fe7cbfb660a3ddf274d471d635266c586)
@@ -86,7 +86,7 @@
 static BOOL doorStateAfterTubingSetInstall;                               ///< Tracks door transition after tubing set install
 static U32  selfTestStartTime;                                            ///< Start time of dry self-tests
 static BOOL selfTestsResumeRequested;                                     ///< Resume requested from STOPPED state
-static BOOL tubingSetLeakChecksStarted;                                    ///< Indicates tubing set leak check started
+static BOOL tubingSetLeakChecksStarted;                                   ///< Indicates tubing set leak check started
 static BOOL barcodeScanResponseReceived;                                  ///< Barcode response received flag
 static U32  authenticationStartTime;                                      ///< Authentication start timer
 static BOOL authResponseReceived;                                         ///< Indicates UI auth response received
@@ -276,7 +276,8 @@
               break;
 
           default:
-              SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_INVALID_DRY_SELF_TEST_STATE, currentDrySelfTestsState );
+              SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                         SW_FAULT_ID_TD_INVALID_DRY_SELF_TEST_STATE, currentDrySelfTestsState );
               break;
    }
 
@@ -309,10 +310,12 @@
 
         selfTestPreviousPublishDataTime = getMSTimerCount();
 
-        data.substate = currentDrySelfTestsState;
-        data.timeout = MAX_DRY_SELF_TEST_TIME;
+        data.substate  = currentDrySelfTestsState;
+        data.timeout   = MAX_DRY_SELF_TEST_TIME;
         data.countdown = ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME ? ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) : 0 );
-        broadcastData( MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
+        broadcastData( MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA,
+                       COMM_BUFFER_OUT_CAN_TD_BROADCAST,
+                       (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }
 
@@ -465,7 +468,7 @@
         authResponseReceived         = TRUE;
         authResponseValidTubingSet   = TRUE;
         authResponseModalityAccepted = TRUE;
-        authenticationStartTime = getMSTimerCount();
+        authenticationStartTime      = getMSTimerCount();
         state = DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE;
     }
     else
@@ -758,7 +761,7 @@
     if ( TRUE == didTimeout( arterialPressureLeakCheckStartTime, ARTERIAL_PRESSURE_LEAK_CHECK_TIME  ) )
     {
         arterialPressureP2 = getFilteredArterialPressure();
-        F32 diff = fabs( arterialPressureP1 - arterialPressureP2 );
+        F32 diff           = fabs( arterialPressureP1 - arterialPressureP2 );
 
         if ( diff <= ARTERIAL_PRESSURE_LEAK_DIFF_TOLERANCE_MMHG )
         {
@@ -1117,7 +1120,7 @@
         {
             signalBloodPumpHardStop();
             setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
-            // Set valves for stop
+            // Set valves to stop
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );