Index: firmware/App/Modes/FPModes/FlushPermeate.c
===================================================================
diff -u -r97f657d47a01b765b72e5193c434dd959c3a3f35 -r7f54a204787abc0840b3593101c8be64de3b8e65
--- firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 97f657d47a01b765b72e5193c434dd959c3a3f35)
+++ firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
@@ -158,6 +158,7 @@
         setValveState( M4_VALV, VALVE_STATE_CLOSED );
         if ( TRUE == isBoostPumpInstalled() )
         {
+            // TODO update the default min duty cycle value after testing
             F32 currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT() > MIN_BOOST_PUMP_DUTY_CYCLE_PCT ? getCurrentBoostPumpDutyCyclePCT(): MIN_BOOST_PUMP_DUTY_CYCLE_PCT;
 
             setBoostPumpTargetDutyCycle( currentDutyCyclePct  );
@@ -175,10 +176,10 @@
         }
     }
 
-    if( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) )
+    if ( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) )
     {
         F32 p18conductivity = getFilteredConductivity( P18_COND );
-        if( PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD > p18conductivity && ( LEVEL_STATE_HIGH == level ) )
+        if ( ( PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD > p18conductivity ) && ( LEVEL_STATE_HIGH == level ) )
         {
             isFlushComplete = TRUE;
             state = PERM_FLUSH_PAUSED;
@@ -187,7 +188,7 @@
         // If conductivity is not in range, continue to monitor until timeout
         else
         {
-            if( TRUE == didTimeout( permeateFlushAlarmTimer, getPermeateFlushAlarmTimeout() ) )
+            if ( TRUE == didTimeout( permeateFlushAlarmTimer, getPermeateFlushAlarmTimeout() ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT, PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD, p18conductivity)
                 state = PERM_FLUSH_PAUSED;
Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -r0778a3f68aec8f654ab001c8da3d447ccf86cf78 -r7f54a204787abc0840b3593101c8be64de3b8e65
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 0778a3f68aec8f654ab001c8da3d447ccf86cf78)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
@@ -63,7 +63,6 @@
 static BOOL isFullAvgValid;                                                                     ///< Flag to check if the average full duty cycle value is valid or not.
 static U32 timeInState;                                                                         ///< Time to wait after reset before starting close loop control (temporary)
 static BOOL stateTransitioned;                                                                  ///< Flag to check if permeate tank state transitioned
-static U32 permeateFlowPersistanceStartTimeMS;                                                  ///< Permeate flow out range alarm timer
 
 // ********** private function prototypes **********
 
@@ -100,7 +99,6 @@
     isFullAvgValid                              = FALSE;
     timeInState                                 = 0;
     stateTransitioned                           = FALSE;
-    permeateFlowPersistanceStartTimeMS          = 0;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -r97f657d47a01b765b72e5193c434dd959c3a3f35 -r7f54a204787abc0840b3593101c8be64de3b8e65
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 97f657d47a01b765b72e5193c434dd959c3a3f35)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
@@ -150,7 +150,7 @@
             break;
     }
 
-    if( previouspreGenPState != preGenPState )
+    if ( previouspreGenPState != preGenPState )
     {
         setModePreGenPTransition( preGenPState );
         SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_CHANGE, preGenPState, previouspreGenPState )
@@ -268,7 +268,7 @@
 
     execFilterFlush();
 
-    if( TRUE == isFilterFlushComplete() )
+    if ( TRUE == isFilterFlushComplete() )
     {
         signalStartPermeateFlush();
         state = FP_PRE_GENP_PERMEATE_FLUSH;
@@ -296,7 +296,7 @@
 
     execPermeateFlush();
 
-    if( TRUE == isPermeateFlushComplete() )
+    if ( TRUE == isPermeateFlushComplete() )
     {
         signalStartConcentrateFlush();
         state = FP_PRE_GENP_CONCENTRATE_FLUSH;
@@ -324,7 +324,7 @@
 
     execConcentrateFlush();
 
-    if( TRUE == isConcentrateFlushComplete() )
+    if ( TRUE == isConcentrateFlushComplete() )
     {
         state = FP_PRE_GENP_VERIFY_WATER;
     }
@@ -346,13 +346,13 @@
     F32 roCurrentDutyCycle = getCurrentROPumpDutyCyclePCT();
 
     //Stay in this state for 25 seconds to stablize flow control
-    if( TRUE == didTimeout( verifyWaterTimer, FLOW_CONTROL_STABLIZED_TIMEOUT_MS ) )
+    if ( TRUE == didTimeout( verifyWaterTimer, FLOW_CONTROL_STABLIZED_TIMEOUT_MS ) )
     {
         isFlowControlStabilized = TRUE;
     }
 
     // check next 5 seconds for water quality
-    if( TRUE == isFlowControlStabilized )
+    if ( TRUE == isFlowControlStabilized )
     {
         // check permeate high flow rate is within range
         checkPermeateHighFlow();
@@ -367,7 +367,7 @@
 //        state = FP_PRE_GENP_PAUSED;
 //    }
     // wait 30 second before moving to water generation mode
-    if( TRUE == didTimeout( verifyWaterTimer, VERIFY_WATER_TIMEOUT_MS ) )
+    if ( TRUE == didTimeout( verifyWaterTimer, VERIFY_WATER_TIMEOUT_MS ) )
     {
         isFlowControlStabilized = FALSE;
         transitionToGenPermeateMode();
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r1abceb4d33eba70426f0bad68060beaf70210cbb -r7f54a204787abc0840b3593101c8be64de3b8e65
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 1abceb4d33eba70426f0bad68060beaf70210cbb)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
@@ -119,7 +119,7 @@
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
 
-    memset( &roRRSamples, 0, RO_RR_MOVING_AVG_NUM_OF_SAMPLES );
+    memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
     // Initialize override structures for each conductivity sensor
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r025a7f95f01583900f371643caf29d551838ea23 -r7f54a204787abc0840b3593101c8be64de3b8e65
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 025a7f95f01583900f371643caf29d551838ea23)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
@@ -60,7 +60,7 @@
     F32 rawRORejectionRatioTankFill;                         ///< RO rejection ratio during tank fill state
     F32 avgRORejectionRatio;                                 ///< RO rejection ratio average during tank full and fill state
     F32 avgRORejectionRatioTankFill;                         ///< RO rejection ratio average during tank fill state
-    U32 genPermeateState;                                    ///< permeate tank state
+    U32 genPermeateState;                                    ///< Permeate tank state
 } RO_REJECTION_RATIO_DATA_T;
 #pragma pack(pop)