Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r2bb8d48b499b9124aa983b5d952b5a261f6efed7 -r9f01014483a2ec46a19bdb7ce7ab97b007f83cbd
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 2bb8d48b499b9124aa983b5d952b5a261f6efed7)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 9f01014483a2ec46a19bdb7ce7ab97b007f83cbd)
@@ -1054,7 +1054,7 @@
             initDrainParameters( DG_RESERVOIR_2 );
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
-            isThisLastDrain       = TRUE;
+            isThisLastDrain = TRUE;
             // Set the chemical disinfect state that is published on the UI
             chemDisinfectUIState  = CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT;
 
@@ -1606,6 +1606,7 @@
     if ( ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState ) || ( DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 == chemDisinfectState ) )
     {
         BOOL isRsrvrVolumeOutOfRange = FALSE;
+
         if ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState )
         {
             isRsrvrVolumeOutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1FullVolume ) > RSRVRS_MAX_LEAK_VOL_CHANGE_ML;
@@ -1722,7 +1723,7 @@
         F32 TPoTemp             = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
         BOOL isCD2OutofRange    = ( cd2Conductivity < MIN_DISINFECT_CONDUCTIVITY_US_PER_CM || cd2Conductivity >  MAX_DISINFECT_CONDUCTIVITY_US_PER_CM );
 
-        #ifndef _RELEASE_
+#ifndef _RELEASE_
         if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) )
         {
             isCD2OutofRange    = FALSE;
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r2bb8d48b499b9124aa983b5d952b5a261f6efed7 -r9f01014483a2ec46a19bdb7ce7ab97b007f83cbd
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 2bb8d48b499b9124aa983b5d952b5a261f6efed7)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9f01014483a2ec46a19bdb7ce7ab97b007f83cbd)
@@ -883,7 +883,6 @@
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
-
     BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
@@ -1013,7 +1012,6 @@
         // If either the dialysate cap or the concentrate cap is open during any state, alarm
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-
             // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
             // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
             U32 ConcCap                 = (U32)getSwitchStatus( CONCENTRATE_CAP );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r2bb8d48b499b9124aa983b5d952b5a261f6efed7 -r9f01014483a2ec46a19bdb7ce7ab97b007f83cbd
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2bb8d48b499b9124aa983b5d952b5a261f6efed7)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9f01014483a2ec46a19bdb7ce7ab97b007f83cbd)
@@ -200,25 +200,21 @@
     else if ( TRUE == pendingStartDGFlushRequest )
     {
         pendingStartDGFlushRequest = FALSE;
-
         requestNewOperationMode( DG_MODE_FLUS );
     }
     else if ( TRUE == pendingStartDGHeatDisinfectRequest )
     {
         pendingStartDGHeatDisinfectRequest = FALSE;
-
         requestNewOperationMode( DG_MODE_HEAT );
     }
     else if ( TRUE == pendingStartDGChemicalDisinfectRequest )
     {
         pendingStartDGChemicalDisinfectRequest = FALSE;
-
         requestNewOperationMode( DG_MODE_CHEM );
     }
     else if ( TRUE == pendingStartDGChemicalDisinfectFlushRequest )
     {
         pendingStartDGChemicalDisinfectFlushRequest = FALSE;
-
         requestNewOperationMode( DG_MODE_CHFL );
     }