Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -raad5e13d6c6b65fe869668fd987af64b75d9e3b8 -r6a1281057f2740ce3d1657f4f9dbeb6dddef98fa
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision aad5e13d6c6b65fe869668fd987af64b75d9e3b8)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6a1281057f2740ce3d1657f4f9dbeb6dddef98fa)
@@ -130,16 +130,16 @@
 static UF_STATE_T handleUFPausedState( DIALYSIS_STATE_T *dialysisState );
 static UF_STATE_T handleUFRunningState( DIALYSIS_STATE_T *dialysisState );
 
-static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( DIALYSIS_STATE_T *dialysisState );
-static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( DIALYSIS_STATE_T *dialysisState );
+static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( void );
+static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( void );
 static SALINE_BOLUS_STATE_T handleSalineBolusInProgressState( DIALYSIS_STATE_T *dialysisState );
 static SALINE_BOLUS_STATE_T handleSalineBolusMaxDeliveredState( DIALYSIS_STATE_T *dialysisState );
 
 #ifdef DIALYZER_REPRIME_ENABLED
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeDialysatePumpsOffState( DIALYSIS_STATE_T *dialysisState );
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior1State( DIALYSIS_STATE_T *dialysisState );
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior2State( DIALYSIS_STATE_T *dialysisState );
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeRePrimeState( DIALYSIS_STATE_T *dialysisState );
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeDialysatePumpsOffState( void );
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior1State( void );
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior2State( void );
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeRePrimeState( void );
 static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgeLinesState( DIALYSIS_STATE_T *dialysisState );
 static void initDialyzerReprime( void );
 #endif
@@ -729,7 +729,7 @@
     // Either a fixed interval or some interval before treatment end.
     if ( ( ++dialyzerReprimeIntervalTimerCtr >= DIALYZER_REPRIME_INTERVAL) ||
          ( ( FALSE == dialyzerReprimeFinalReprimeFinished ) &&
-           ( getTreatmentTimeRemainingSecs() <= DIALYZER_REPRIME_BEFORE_TREATEMENT_END_INTERVAL_SEC)
+           ( getTreatmentTimeRemainingSecs() <= DIALYZER_REPRIME_BEFORE_TREATEMENT_END_INTERVAL_SEC )
          )
        )
     {
@@ -780,11 +780,11 @@
     switch ( currentSalineBolusState )
     {
         case SALINE_BOLUS_STATE_IDLE:
-            currentSalineBolusState = handleSalineBolusIdleState( &result );
+            currentSalineBolusState = handleSalineBolusIdleState();
             break;
 
         case SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP:
-            currentSalineBolusState = handleSalineBolusWait4Pumps2Stop( &result );
+            currentSalineBolusState = handleSalineBolusWait4Pumps2Stop();
             break;
 
         case SALINE_BOLUS_STATE_IN_PROGRESS:
@@ -826,19 +826,19 @@
     switch ( currentDialyzerReprimeState )
     {
         case DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF:
-            currentDialyzerReprimeState = handleDialyzerReprimeDialysatePumpsOffState( &result );
+            currentDialyzerReprimeState = handleDialyzerReprimeDialysatePumpsOffState();
             break;
 
         case DIALYZER_REPRIME_STATE_PURGE_PRIOR_1:
-            currentDialyzerReprimeState = handleDialyzerReprimePurgePrior1State( &result );
+            currentDialyzerReprimeState = handleDialyzerReprimePurgePrior1State();
             break;
 
         case DIALYZER_REPRIME_STATE_PURGE_PRIOR_2:
-            currentDialyzerReprimeState = handleDialyzerReprimePurgePrior2State( &result );
+            currentDialyzerReprimeState = handleDialyzerReprimePurgePrior2State();
             break;
 
         case DIALYZER_REPRIME_STATE_REPRIME:
-            currentDialyzerReprimeState = handleDialyzerReprimeRePrimeState( &result );
+            currentDialyzerReprimeState = handleDialyzerReprimeRePrimeState();
             break;
 
         case DIALYZER_REPRIME_STATE_PURGE_LINES:
@@ -947,10 +947,9 @@
  * saline bolus state machine.
  * @details Inputs: none
  * @details Outputs:
- * @param dialysisState next dialysis state
  * @return next saline bolus state
  *************************************************************************/
-static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( DIALYSIS_STATE_T *dialysisState )
+static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( void )
 {
     SALINE_BOLUS_STATE_T result = SALINE_BOLUS_STATE_IDLE;
 
@@ -976,10 +975,9 @@
  * to stop state of the saline bolus state machine.
  * @details Inputs: none
  * @details Outputs:
- * @param dialysisState next dialysis state
  * @return next saline bolus state
  *************************************************************************/
-static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( DIALYSIS_STATE_T *dialysisState )
+static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( void )
 {
     SALINE_BOLUS_STATE_T result = SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP;
 
@@ -1145,10 +1143,9 @@
  * dialyzer reprime state machine.
  * @details Inputs: isDialInPumpRunning(), isDialOutPumpRunning(), dialyzerReprimeInProgress flag
  * @details Outputs: next dialyzer reprime state, dialyzerReprimeInProgress flag
- * @param dialysis state
  * @return next dialyzer reprime state
  *************************************************************************/
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeDialysatePumpsOffState( DIALYSIS_STATE_T *dialysisState )
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeDialysatePumpsOffState( void )
 {
     DIALYZER_REPRIME_STATE_T result = DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF;
 
@@ -1184,10 +1181,9 @@
  * state machine.
  * @details Inputs: dialyzerReprimeStateTimer
  * @details Outputs: dialyzerReprimeStateTimer, next dialyzer reprime state
- * @param dialysis state
  * @return next dialyzer reprime state
  *************************************************************************/
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior1State( DIALYSIS_STATE_T *dialysisState )
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior1State( void )
 {
     DIALYZER_REPRIME_STATE_T result = DIALYZER_REPRIME_STATE_PURGE_PRIOR_1;
 
@@ -1213,10 +1209,9 @@
  * state machine.
  * @details Inputs: dialyzerReprimeStateTimer
  * @details Outputs: next dialyzer reprime state
- * @param dialysis state
  * @return next dialyzer reprime state
  *************************************************************************/
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior2State( DIALYSIS_STATE_T *dialysisState )
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior2State( void )
 {
     DIALYZER_REPRIME_STATE_T result = DIALYZER_REPRIME_STATE_PURGE_PRIOR_2;
 
@@ -1228,6 +1223,7 @@
         dialyzerReprimeInProgress = FALSE; // This will cause a transition to reprime state after pumps stop
         result = DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF;
     }
+
     return result;
 }
 
@@ -1237,10 +1233,9 @@
  * state machine.
  * @details Inputs: dialyzerReprimeStateTimer
  * @details Outputs: dialyzerReprimeStateTimer, next dialyzer reprime state
- * @param dialysis state
  * @return next dialyzer reprime state
  *************************************************************************/
-static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeRePrimeState( DIALYSIS_STATE_T *dialysisState )
+static DIALYZER_REPRIME_STATE_T handleDialyzerReprimeRePrimeState( void )
 {
     DIALYZER_REPRIME_STATE_T result = DIALYZER_REPRIME_STATE_REPRIME;
 
@@ -1264,7 +1259,7 @@
  * @details Inputs: dialyzerReprimeStateTimer
  * @details Outputs: dialyzerReprimeStateTimer, dialyzerReprimeInProgress,
  * dialyzerReprimeIntervalTimerCtr, next dialyzer reprime state
- * @param dialysis state
+ * @param dialysis Dialysis state
  * @return next dialyzer reprime state
  *************************************************************************/
 static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgeLinesState( DIALYSIS_STATE_T *dialysisState )