Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r534eda5c2dcb3a7c45159ff0236535b54be64188 -r75650c25b8a04b96c46daf60dcffd3982e07f8af
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 534eda5c2dcb3a7c45159ff0236535b54be64188)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 75650c25b8a04b96c46daf60dcffd3982e07f8af)
@@ -15,8 +15,8 @@
 *
 ***************************************************************************/
 
-#include "AirTrap.h"
 #include "AirPump.h"
+#include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "DDInterface.h"
Index: firmware/App/Services/StateServices/TubeSetInstall.c
===================================================================
diff -u -r027a8c7ac2a20cae3304dd6d72d54a1edbc19820 -r75650c25b8a04b96c46daf60dcffd3982e07f8af
--- firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 027a8c7ac2a20cae3304dd6d72d54a1edbc19820)
+++ firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 75650c25b8a04b96c46daf60dcffd3982e07f8af)
@@ -56,12 +56,12 @@
 
 // ********** private function prototypes **********
 
-static TUBE_SET_INSTALL_STATE_T handleAwaitTubesetConfirmationState( void );          ///< Handle Await Tubset Install Confirmation sub-state
-static TUBE_SET_INSTALL_STATE_T handleAwaitBPDoorCloseState( void );                  ///< Handle Await Blood Pump Door Close sub-state.
-static TUBE_SET_INSTALL_STATE_T handleAutoLoadState( void );                          ///< Handle Auto-Load sub-state
-static TUBE_SET_INSTALL_STATE_T handleAwaitSetupConnectionConfirmationState( void );  ///< Handle Await Setup Connection Confirmation sub-state
-static TUBE_SET_INSTALL_STATE_T handleAutoLoadBackOffState( void );                   ///< Handle Auto-Load Back-off sub-state
-static TUBE_SET_INSTALL_STATE_T handleInstallCompleteState( void );                   ///< Handle Install complete state
+static TUBE_SET_INSTALL_STATE_T handleAwaitTubesetConfirmationState( void );
+static TUBE_SET_INSTALL_STATE_T handleAwaitBPDoorCloseState( void );
+static TUBE_SET_INSTALL_STATE_T handleAutoLoadState( void );
+static TUBE_SET_INSTALL_STATE_T handleAwaitSetupConnectionConfirmationState( void );
+static TUBE_SET_INSTALL_STATE_T handleAutoLoadBackOffState( void );
+static TUBE_SET_INSTALL_STATE_T handleInstallCompleteState( void );
 
 /*********************************************************************//**
 * @brief
@@ -384,7 +384,7 @@
  * The handleSetupTubingSetConnectionConfirmRequest function handles a UI request
  * to confirm setup connections are complete.
  * @details \b Message \b Sent: MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE
- * @details \b Inputs: none
+ * @details \b Inputs: currentInstallState
  * @details \b Outputs: setupConnectionsConfirmed
  * @param message UI message which includes the user confirmation of
  * setup connections completion.