Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r06477e29097a60ca81d5d9382c4a773d30dedf69 -rcbaa57803fa8359407a799fca0cde6ae2c486bd7
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 06477e29097a60ca81d5d9382c4a773d30dedf69)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cbaa57803fa8359407a799fca0cde6ae2c486bd7)
@@ -8,7 +8,7 @@
 * @file    SyringePump.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-Jun-2022
+* @date    (last)      13-Jul-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -503,12 +503,9 @@
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
         {
-            heparinDeliveryState = HEPARIN_STATE_STOPPED;
-            if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
-            {
-                syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
-                syringePumpRetractRequested = TRUE;
-            }
+            heparinDeliveryState        = HEPARIN_STATE_STOPPED;
+            syringePumpSetRate          = SYRINGE_PUMP_RETRACT_RATE;
+            syringePumpRetractRequested = TRUE;
         }
     }
 
@@ -609,7 +606,6 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
-
     }
 
     return syringePumpBolusRequested;
@@ -1858,9 +1854,9 @@
     syringePumpRampTimerCtr++;
     if ( syringePumpRampUpToggleTime > syringePumpSetToggleTime )
     {
-        syringePumpRampUpToggleTime = (U32)((F32)SYRINGE_PUMP_START_RAMP_SPEED /
-                                            (F32)( ( syringePumpRampTimerCtr * syringePumpRampTimerCtr * syringePumpRampTimerCtr ) / SYRINGE_PUMP_RAMP_DIVISOR ) );
-        syringePumpRampUpPct = syringePumpSetToggleTime / syringePumpRampUpToggleTime;
+        syringePumpRampUpToggleTime = (U32)( (F32)SYRINGE_PUMP_START_RAMP_SPEED /
+                                             ( (F32)( syringePumpRampTimerCtr * syringePumpRampTimerCtr * syringePumpRampTimerCtr ) / (F32)SYRINGE_PUMP_RAMP_DIVISOR ) );
+        syringePumpRampUpPct = (F32)syringePumpSetToggleTime / (F32)syringePumpRampUpToggleTime;
         if ( syringePumpRampUpToggleTime > syringePumpSetToggleTime )
         {
             setFPGASyringePumpStepToggleTime( syringePumpRampUpToggleTime );