Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r5aee05d242962c2f9294577c3ba5015f9342fb83 -r2ac3479b027dd1dab8673b9959ab13234a68d842
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 5aee05d242962c2f9294577c3ba5015f9342fb83)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 2ac3479b027dd1dab8673b9959ab13234a68d842)
@@ -206,7 +206,6 @@
 static void monitorModeChemicalDisinfect( void );
 static void writeDisinfectDataToNV( DG_USAGE_INFO_ITEMS_T info );
 
-
 /*********************************************************************//**
  * @brief
  * The initChemicalDisinfectMode function initializes the chemical
@@ -695,8 +694,9 @@
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT;
     F32 cd2Conductivity             = getConductivityValue( (U32)CONDUCTIVITYSENSORS_CD2_SENSOR );
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID;
+
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
 #ifndef _RELEASE_
@@ -750,8 +750,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantFlushState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID;
+
     writeDisinfectDataToNV( USAGE_INFO_CHEM_DIS_START );
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
@@ -820,8 +821,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectFillWithDisinfectantState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
+
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
     // First reservoir 1 must be full
@@ -882,8 +884,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectR1ToR2State( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
+
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
     chemicalDisinfectTimerUpdate();
 
@@ -983,8 +986,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectR2ToR1State( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE;
+
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
     chemicalDisinfectTimerUpdate();
 
@@ -1111,9 +1115,10 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeBasicPathState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT;
-    cancellationMode                = CANCELLATION_MODE_BASIC;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT;
+    cancellationMode     = CANCELLATION_MODE_BASIC;
+
     failChemicalDisinfect();
 
     return state;
@@ -1132,8 +1137,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT;
+
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {
         // Stop all the actuators first then decide who should run next
@@ -1203,8 +1209,9 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCompleteState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_COMPLETE;
-    chemDisinfectUIState            = CHEM_DISINFECT_UI_STATE_COMPLETE;
 
+    chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_COMPLETE;
+
     requestNewOperationMode( DG_MODE_CHFL );
 
     return state;