Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r9f01014483a2ec46a19bdb7ce7ab97b007f83cbd -rdaf4763d6f40baf4cbc2f9d88aba7d9faf588ad6
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9f01014483a2ec46a19bdb7ce7ab97b007f83cbd)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision daf4763d6f40baf4cbc2f9d88aba7d9faf588ad6)
@@ -341,7 +341,6 @@
     setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
     rsrvrFillStableTimeCounter = 0;
     rsrvr1Status               = DG_RESERVOIR_ABOVE_TARGET;
-
     stateTimer                 = getMSTimerCount();
 
     return state;
@@ -376,7 +375,6 @@
         setValveState( VRD1, VALVE_STATE_CLOSED );
         setValveState( VRD2, VALVE_STATE_OPEN );
         rsrvr2Status                = DG_RESERVOIR_ABOVE_TARGET;
-
         state                       = DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2;
         stateTimer                  = getMSTimerCount();
     }
@@ -424,7 +422,6 @@
             setValveState( VRD2, VALVE_STATE_CLOSED );
             setValveState( VPI, VALVE_STATE_OPEN );
             turnOnUVReactor( INLET_UV_REACTOR );
-
             stateTrialCounter = 0;
             stateTimer        = getMSTimerCount();
             state             = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN;
@@ -455,8 +452,6 @@
 {
     DG_CHEM_DISINFECT_FLUSH_STATE_T state = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN;
 
-    // TODO: check whether flush has already been completed within some time period, skip this state if it has
-
     // Check if flush time has elapsed
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
@@ -472,7 +467,6 @@
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMP_CP2_FLUSH_SPEED_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
             turnOnUVReactor( OUTLET_UV_REACTOR );
-
             stateTimer                           = getMSTimerCount();
             state                                = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE;
         }
@@ -482,7 +476,6 @@
             {
                 stateTimer                       = getMSTimerCount();
             }
-
             else
             {   // Couldn't get a good water sample after a couple of trials and the disinfect flush cycle failed
                 alarmDetectedPendingTrigger      = ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE; //TODO: ALARM_ID_DG_NEW_WAT;
@@ -516,7 +509,6 @@
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRD2, VALVE_STATE_OPEN );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
-
         stateTimer = getMSTimerCount();
         state      = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF;
     }
@@ -551,7 +543,6 @@
         rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
         drainTimer   = getMSTimerCount();
         numberOfPostDisinfectRinses = 0;
-
         stateTimer   = getMSTimerCount();
         state        = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1;
     }
@@ -621,7 +612,6 @@
         rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
         rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
         drainTimer   = getMSTimerCount();
-
         stateTimer   = getMSTimerCount();
         state        = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2;
     }
@@ -695,7 +685,6 @@
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             drainTimer   = getMSTimerCount();
-
             stateTimer   = getMSTimerCount();
             state        = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1;
         }
@@ -722,9 +711,7 @@
             //Turn off UV reactors
             turnOffUVReactor( INLET_UV_REACTOR );
             turnOffUVReactor( OUTLET_UV_REACTOR );
-
             isThisLastDrain = TRUE;
-
             stateTimer      = getMSTimerCount();
             state           = DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1;
         }
@@ -969,7 +956,6 @@
  *************************************************************************/
 static void publishChemicalDisinfectFlushData( void )
 {
-    // TODO: decide what data to publish
     if ( ++dataPublishCounter >= CHEM_DISINFECT_FLUSH_DATA_PUB_INTERVAL )
     {
         MODE_CHEMICAL_DISINFECT_FLUSH_DATA_T data;
@@ -1005,6 +991,10 @@
  *************************************************************************/
 static void monitorModeChemicalDisinfectFlush( void )
 {
+    BOOL hasConductivityFailed = TRUE;
+    BOOL hasInletPressureFailed = TRUE;
+    BOOL hasInletTemperatureFailed = TRUE;
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -1023,10 +1013,6 @@
     }
 
     // In some states, check inlet temperature, inlet pressure, and inlet conductivity.
-    BOOL hasConductivityFailed = TRUE;
-    BOOL hasInletPressureFailed = TRUE;
-    BOOL hasInletTemperatureFailed = TRUE;
-
     haveInletWaterChecksPassed= TRUE;
 
     hasConductivityFailed     = ( ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  >  MAX_INLET_CONDUCTIVITY_US_PER_CM ) ||