Index: firmware/App/Modes/StatePreTxHeparinSetup.c
===================================================================
diff -u -raf1e58e3760be09083f2d349f7d37c19e1275ac6 -rc55d2e00f6e4d0a0a5f5968dc02e6d719f643a3a
--- firmware/App/Modes/StatePreTxHeparinSetup.c	(.../StatePreTxHeparinSetup.c)	(revision af1e58e3760be09083f2d349f7d37c19e1275ac6)
+++ firmware/App/Modes/StatePreTxHeparinSetup.c	(.../StatePreTxHeparinSetup.c)	(revision c55d2e00f6e4d0a0a5f5968dc02e6d719f643a3a)
@@ -83,6 +83,8 @@
     interruptedPreTxHeparinSetupState = PRE_TX_HEPARIN_SETUP_PRELOAD_STATE;
     syringeRetractStarted = FALSE;
     syringePreloadStarted = FALSE;
+    heparinSetupResumeRequested = FALSE;
+    syringeLoadConfirmed = FALSE;
 
     resetPreTxHeparinSetupFlags();
 }
@@ -150,7 +152,8 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_INVALID_PRE_TX_HEPARIN_SETUP_STATE, currentPreTxHeparinSetupState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                       SW_FAULT_ID_TD_INVALID_PRE_TX_HEPARIN_SETUP_STATE, currentPreTxHeparinSetupState );
             break;
     }
 
@@ -248,9 +251,9 @@
     switch ( state )
     {
         case PRE_TX_HEPARIN_SETUP_PRELOAD_STATE:
-        // Retract and preload sequencing is handled by
-        // handlePreTxHeparinPreloadState().
-         break;
+            // Retract and preload sequencing is handled by
+            // handlePreTxHeparinPreloadState().
+            break;
 
         case PRE_TX_HEPARIN_SETUP_SEEK_STATE:
             seekSyringePlunger();
@@ -322,6 +325,10 @@
             syringePreloadStarted = preloadSyringePlunger();
         }
     }
+    else
+    {
+        // No action required.
+    }
 
     return state;
 }
@@ -331,7 +338,7 @@
  * The handlePreTxHeparinAwaitSyringeLoadConfirmationState function handles
  * the await syringe load confirmation state.
  * @details \b Inputs: syringeLoadConfirmed and alarm stop status.
-  * @details \b Outputs: interruptedPreTxHeparinSetupState and syringe
+ * @details \b Outputs: interruptedPreTxHeparinSetupState and syringe
  * pump operating state.
  * @return Current or next pre-treatment heparin setup state.
  *************************************************************************/
@@ -350,6 +357,10 @@
         setupPreTxHeparinState( PRE_TX_HEPARIN_SETUP_SEEK_STATE );
         state = PRE_TX_HEPARIN_SETUP_SEEK_STATE;
     }
+    else
+    {
+        // No action required.
+    }
 
     return state;
 }
@@ -388,6 +399,10 @@
             state = PRE_TX_HEPARIN_SETUP_PAUSED_STATE;
         }
     }
+    else
+    {
+        // No action required.
+    }
 
     return state;
 }
@@ -416,6 +431,10 @@
         setupPreTxHeparinState( PRE_TX_HEPARIN_SETUP_OCCLUSION_CHECK_STATE );
         state = PRE_TX_HEPARIN_SETUP_OCCLUSION_CHECK_STATE;
     }
+    else
+    {
+        // No action required.
+    }
 
     return state;
 }
@@ -489,6 +508,10 @@
     {
         PreTxRequestContinueFromHeparinSetupRequested();
     }
+    else
+    {
+        // No action required.
+    }
 
     return state;
 }
@@ -537,7 +560,8 @@
 
             // An unexpected interrupted state indicates a software fault.
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_INVALID_PRE_TX_HEPARIN_SETUP_STATE, interruptedPreTxHeparinSetupState );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                           SW_FAULT_ID_TD_INVALID_PRE_TX_HEPARIN_SETUP_STATE, interruptedPreTxHeparinSetupState );
                 state = PRE_TX_HEPARIN_SETUP_PAUSED_STATE;
                 break;
         }
Index: firmware/App/Modes/StatePreTxHeparinSetup.h
===================================================================
diff -u -rc27a2530b0cab5dc46459037c7ff7816b1a21dad -rc55d2e00f6e4d0a0a5f5968dc02e6d719f643a3a
--- firmware/App/Modes/StatePreTxHeparinSetup.h	(.../StatePreTxHeparinSetup.h)	(revision c27a2530b0cab5dc46459037c7ff7816b1a21dad)
+++ firmware/App/Modes/StatePreTxHeparinSetup.h	(.../StatePreTxHeparinSetup.h)	(revision c55d2e00f6e4d0a0a5f5968dc02e6d719f643a3a)
@@ -36,11 +36,11 @@
 
 // ********** public function prototypes **********
 
-void initPreTxHeparinSetup( void );                         // Initialize this unit
-void transitionToPreTxHeparinSetup( void );                 // Prepares for transition to pre-treatment heparin setup state
-void execPreTxHeparinSetup( void );                         // Execute the pre-treatment heparin setup state machine
+void initPreTxHeparinSetup( void );                            // Initialize this unit
+void transitionToPreTxHeparinSetup( void );                    // Prepares for transition to pre-treatment heparin setup state
+void execPreTxHeparinSetup( void );                            // Execute the pre-treatment heparin setup state machine
 
-U32 getPreTxHeparinSetupState( void );                      // Gets current pre-treatment heparin setup state
+U32 getPreTxHeparinSetupState( void );                         // Gets current pre-treatment heparin setup state
 
 void signalResumePreTxHeparinSetup( void );                    // Signal resume request for pre-treatment heparin setup
 BOOL isPreTxHeparinAwaitingSyringeLoadConfirmation( void );    // Returns TRUE when awaiting syringe load confirmation