Index: firmware/App/Controllers/BoostPump.c
===================================================================
diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff
--- firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0)
+++ firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff)
@@ -15,12 +15,8 @@
 *
 ***************************************************************************/
 
-//#include <math.h>
-
-
 #include "BoostPump.h"
 #include "Flow.h"
-#include "FluidPump.h"
 #include "FPOperationModes.h"
 //#include "NVDataMgmt.h"
 #include "Messaging.h"
@@ -278,21 +274,21 @@
     BOOST_PUMP_STATE_T state = BOOST_PUMP_CONTROL_TO_TARGET_FLOW_STATE;
 
     // Check if need to switch control modes
-    if ( getTargetBoostPumpPressure() > 0.0F && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
+    if ( ( getTargetBoostPumpPressure() > 0.0F ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
     {
         // Transition to target pressure
         resetPIController( PI_CONTROLLER_ID_BOOST_PUMP_PRES, boostPumpDutyCyclePctSet, 0 );
         state = BOOST_PUMP_CONTROL_TO_TARGET_PRESSURE_STATE;
     }
-    else if ( getTargetBoostPumpDutyCyclePCT() > 0.0F && ( PUMP_CONTROL_MODE_OPEN_LOOP == boostPumpControlMode ) )
+    else if ( ( getTargetBoostPumpDutyCyclePCT() > 0.0F ) && ( PUMP_CONTROL_MODE_OPEN_LOOP == boostPumpControlMode ) )
     {
         setFluidPumpPctToPWMDutyCycle( P40_PUMP, getTargetBoostPumpDutyCyclePCT() );
         boostPumpDutyCyclePctSet = getTargetBoostPumpDutyCyclePCT();
         state = BOOST_PUMP_OPEN_LOOP_STATE;
     }
 
     // Control at set interval or shut off
-    if ( getTargetBoostPumpFlowRateMLPM() == 0.0F && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
+    if ( ( getTargetBoostPumpFlowRateMLPM() == 0.0F ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
     {
         signalBoostPumpHardStop();
     }
@@ -325,15 +321,15 @@
         resetPIController( PI_CONTROLLER_ID_BOOST_PUMP_FLOW, boostPumpDutyCyclePctSet, 0.0F );
         state = BOOST_PUMP_CONTROL_TO_TARGET_FLOW_STATE;
     }
-    else if ( getTargetBoostPumpDutyCyclePCT() > 0.0F && ( PUMP_CONTROL_MODE_OPEN_LOOP == boostPumpControlMode ) )
+    else if ( ( getTargetBoostPumpDutyCyclePCT() > 0.0F ) && ( PUMP_CONTROL_MODE_OPEN_LOOP == boostPumpControlMode ) )
     {
         setFluidPumpPctToPWMDutyCycle( P40_PUMP, getTargetBoostPumpDutyCyclePCT() );
         boostPumpDutyCyclePctSet = getTargetBoostPumpDutyCyclePCT();
         state = BOOST_PUMP_OPEN_LOOP_STATE;
     }
 
     // Control at set interval or shut off
-    if ( getTargetBoostPumpPressure() == 0.0F && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
+    if ( ( getTargetBoostPumpPressure() == 0.0F ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == boostPumpControlMode ) )
     {
         signalBoostPumpHardStop();
     }
@@ -475,7 +471,6 @@
     return status;
 }
 
-
 /*********************************************************************//**
  * @brief
  * The getTargetBoostPumpDutyCyclePCT function gets the current target Boost pump
@@ -754,5 +749,4 @@
     return result;
 }
 
-
 /**@}*/