Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r5a29e093e8a11f971c312cab5f6e7fedae2953db -re5988dee900797f8e2b40b3e72d18f390d7b7402
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 5a29e093e8a11f971c312cab5f6e7fedae2953db)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e5988dee900797f8e2b40b3e72d18f390d7b7402)
@@ -166,7 +166,7 @@
         case POST_TX_AUTO_EJECT_STATE_RETRACTING_EJECTOR:
             currentPostTxAutoEjectState = handleAutoEjectRetractingEjectorState();
 
-            if( NUM_OF_POST_TX_AUTO_EJECT_SUB_STATES == currentPostTxAutoEjectState )
+            if ( NUM_OF_POST_TX_AUTO_EJECT_SUB_STATES == currentPostTxAutoEjectState )
             {
                 state = TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
             }
@@ -201,23 +201,23 @@
     POST_TX_AUTO_EJECT_STATE_T subState = POST_TX_AUTO_EJECT_STATE_HOMING;
 
     // Issue both homing commands once on state entry
-    if( FALSE == setEntryActuatorCmdIssued )
+    if ( FALSE == setEntryActuatorCmdIssued )
     {
         homeBloodPump();
         homeEjector();
         setEntryActuatorCmdIssued = TRUE;
     }
 
-    if( ++autoEjectTimerCounter >= AUTO_EJECT_OPERATION_TIMEOUT_INTERVAL)
+    if ( ++autoEjectTimerCounter >= AUTO_EJECT_OPERATION_TIMEOUT_INTERVAL)
     {
         signalBloodPumpHardStop();
 
-        if( TRUE == isPumpHomeInProgress() )
+        if ( TRUE == isPumpHomeInProgress() )
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AUTO_LOAD_EJECT_BP_TIMEOUT, (U32)isPeristalticPumpHome(), autoEjectTimerCounter );
         }
 
-        if( EJECTOR_STATE_RETRACTED != getEjectorState() )
+        if ( EJECTOR_STATE_RETRACTED != getEjectorState() )
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AUTO_EJECT_EJECTOR_TIMEOUT, (U32)getEjectorState(), autoEjectTimerCounter );
         }
@@ -229,7 +229,7 @@
         BOOL bpHomed = ( FALSE == isPumpHomeInProgress() );
         BOOL ejectorHomed = ( EJECTOR_STATE_RETRACTED == getEjectorState() );
 
-        if( ( TRUE == bpHomed ) && ( TRUE == ejectorHomed ) )
+        if ( ( TRUE == bpHomed ) && ( TRUE == ejectorHomed ) )
         {
             subState = POST_TX_AUTO_EJECT_STATE_EXTENDING_EJECTOR;
         }
@@ -284,24 +284,24 @@
 {
     POST_TX_AUTO_EJECT_STATE_T subState = POST_TX_AUTO_EJECT_STATE_EJECTING;
 
-    setBloodPumpTargetFlowRate( AUTO_EJECT_BLOOD_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP);
+    setBloodPumpTargetFlowRate( AUTO_EJECT_BLOOD_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
-    if( ++autoEjectTimerCounter >= AUTO_EJECT_OPERATION_TIMEOUT_INTERVAL )
+    if ( ++autoEjectTimerCounter >= AUTO_EJECT_OPERATION_TIMEOUT_INTERVAL )
     {
         signalBloodPumpHardStop();
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AUTO_LOAD_EJECT_BP_TIMEOUT, autoEjectHomePosCleared, isPeristalticPumpHome() );
         requestNewOperationMode( MODE_FAUL);
     }
     else
     {
-        if( FALSE == autoEjectHomePosCleared )
+        if ( FALSE == autoEjectHomePosCleared )
         {
-            if( FALSE == isPeristalticPumpHome() )
+            if ( FALSE == isPeristalticPumpHome() )
             {
                 autoEjectHomePosCleared = TRUE;
             }
         }
-        else if( TRUE == isPeristalticPumpHome() )
+        else if ( TRUE == isPeristalticPumpHome() )
         {
             signalBloodPumpHardStop();
             subState = POST_TX_AUTO_EJECT_STATE_RETRACTING_EJECTOR;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r5a29e093e8a11f971c312cab5f6e7fedae2953db -re5988dee900797f8e2b40b3e72d18f390d7b7402
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5a29e093e8a11f971c312cab5f6e7fedae2953db)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e5988dee900797f8e2b40b3e72d18f390d7b7402)
@@ -299,7 +299,7 @@
     if ( sizeof( BOOL ) == message->hdr.payloadLen )
     {
         memcpy( &confirmed, message->payload, sizeof( BOOL ) );
-        if( TRUE == confirmed )
+        if ( TRUE == confirmed )
         {
             confirmTubesetPlaced = TRUE;
             result = TRUE;