Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rd48e02f028dbd430bedda41be0173fbfc45116d7 -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision d48e02f028dbd430bedda41be0173fbfc45116d7)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1)
@@ -444,7 +444,7 @@
              turnOnUVReactor( OUTLET_UV_REACTOR );
 
              flushUIState = FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH;
-             state = DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE;
+             state        = DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE;
          }
 
          stateTimerStart = getMSTimerCount();
@@ -479,8 +479,7 @@
         turnOnUVReactor( OUTLET_UV_REACTOR );
 
         stateTimerStart = getMSTimerCount();
-
-        state = DG_FLUSH_STATE_FLUSH_DIALYSATE;
+        state           = DG_FLUSH_STATE_FLUSH_DIALYSATE;
     }
 
     return state;
@@ -742,7 +741,7 @@
     writeDisinfectDataToNV( USAGE_INFO_FILTER_FLUSH );
 
     F32 waterFlowRate = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
-    F32 waterVolume = ( ( waterFlowRate / SEC_PER_MIN ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+    F32 waterVolume   = ( ( waterFlowRate / SEC_PER_MIN ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
     // Integrate volume of water moved through line
     flushLinesVolumeL += waterVolume;
@@ -758,14 +757,12 @@
         setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
         stateTimerStart = getMSTimerCount();
-
-        state = DG_FLUSH_STATE_FLUSH_CIRCULATION;
+        state           = DG_FLUSH_STATE_FLUSH_CIRCULATION;
     }
     else if ( TRUE == didTimeout( stateTimerStart, FLUSH_DRAIN_LINE_TIMEOUT_MS ) )
     {
         alarmDetectedPendingTrigger = ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT;
-        // Could not reach to the defined drain line on time
-        state = DG_FLUSH_STATE_CANCEL_BASIC_PATH;
+        state                       = DG_FLUSH_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
@@ -791,8 +788,7 @@
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
 
         stateTimerStart = getMSTimerCount();
-
-        state = DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER;
+        state           = DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER;
     }
 
     return state;