Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r352a720124edcbbc0c58856c2d23ddf32e558c02 -r30b88046bfac18be0a31693840562a961866eb07
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 352a720124edcbbc0c58856c2d23ddf32e558c02)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 30b88046bfac18be0a31693840562a961866eb07)
@@ -326,10 +326,10 @@
     DG_CHEM_DISINFECT_FLUSH_STATE_T state = DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1;
 
     // Set the chemical disinfect flush state that is published on the UI
-    chemDisinfectFlushUIState = CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT;
+    chemDisinfectFlushUIState             = CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT;
 
     // Start overall chemical disinfect timer
-    overallChemDisinfectFlushTimer = getMSTimerCount();
+    overallChemDisinfectFlushTimer        = getMSTimerCount();
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
@@ -352,7 +352,6 @@
  * otherwise, it transitions to basic cancellation path.
  * @details Inputs: stateTimer, rsrvr1Status, rsrvr2Status
  * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status,
- * ChemDisinfectFlushUIState
  * @return next state of the chemical disinfect flush state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_FLUSH_STATE_T handleChemicalDisinfectFlushDrainR1State( void )
@@ -925,10 +924,10 @@
     {
         if ( ++rsrvrFillToFullStableTimerCounter >= RSRVRS_FILL_TO_FULL_STABLE_TASK_INT )
         {
-            status                           = DG_RESERVOIR_REACHED_TARGET;
+            status                            = DG_RESERVOIR_REACHED_TARGET;
             rsrvrFillToFullStableTimerCounter = 0;
             // Set the state timer in case it needs to be used for another timeout check
-            stateTimer                       = getMSTimerCount();
+            stateTimer                        = getMSTimerCount();
         }
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
@@ -960,11 +959,12 @@
         MODE_CHEMICAL_DISINFECT_FLUSH_DATA_T data;
         MODE_CHEMICAL_DISINFECT_FLUSH_UI_DATA_T uiData;
 
-        data.chemDisinfectFlushState = (U32)chemDisinfectFlushState;
-        data.stateElapsedTime   = calcTimeSince( stateTimer );
-        data.overallElapsedTime = calcTimeSince( overallChemDisinfectFlushTimer );
-        data.postDisinfectCurrentRinseCount = numberOfPostDisinfectRinses;
-        data.cancellationMode   = (U32)cancellationMode;
+        data.chemDisinfectFlushState           = (U32)chemDisinfectFlushState;
+        data.stateElapsedTime                  = calcTimeSince( stateTimer );
+        data.overallElapsedTime                = calcTimeSince( overallChemDisinfectFlushTimer );
+        data.postDisinfectCurrentRinseCount    = numberOfPostDisinfectRinses;
+        data.cancellationMode                  = (U32)cancellationMode;
+        data.chemDisinfectFlushUIState         = chemDisinfectFlushUIState;
         uiData.chemDisinfectFlushTargetTime    = CHEM_DISINFECT_FLUSH_TIME_MS;
         uiData.chemDisinfectFlushCountdownTime = calcTimeSince( overallChemDisinfectFlushTimer );