Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -rf0ea13c1a9908920793be07a946dc366d2ab5019 -r421336466eff4ba9fef0ca5416043e5d83c63841
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision f0ea13c1a9908920793be07a946dc366d2ab5019)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 421336466eff4ba9fef0ca5416043e5d83c63841)
@@ -252,79 +252,79 @@
     response.rejectionReason = REQUEST_REJECT_REASON_NONE;
 
     // Verify payload length is valid
-    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    if ( sizeof( BOOL ) == message->hdr.payloadLen )
     {
-        U32 requestedState = 0U;
+        BOOL requestedState = FALSE;
 
-        memcpy( &requestedState, message->payload, sizeof( U32 ) );
+        memcpy( &requestedState, message->payload, sizeof( requestedState ) );
 
         // Handle request to resume ultrafiltration
-        if ( requestedState == 0U )
+        if ( requestedState == FALSE )
         {
-            if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_PAUSED_STATE == currentDialysisState ) )
+            if ( ( MODE_TREA == currMode ) &&
+                 ( TREATMENT_DIALYSIS_STATE == trtState ) &&
+                 ( DIALYSIS_UF_PAUSED_STATE == currentDialysisState ) )
             {
                 ufResumeRequested = TRUE;
                 response.accepted = TRUE;
-                if ( setUFRateLHr > 0.0 )
+
+                if ( setUFRateLHr > 0.0F )
                 {
-                    //sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, setUFRateLHr );
+                    // sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0F, setUFRateLHr );
                 }
             }
+            else if ( MODE_TREA != currMode )
+            {
+                response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
+            }
+            else if ( TREATMENT_DIALYSIS_STATE != trtState )
+            {
+                response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
+            }
             else
             {
-                if ( MODE_TREA != currMode )
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
-                }
-                else if ( TREATMENT_DIALYSIS_STATE != trtState )
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
-                }
-                else
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_PAUSED;
-                }
+                response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_PAUSED;
             }
         }
         // Handle request to pause ultrafiltration
-        else if ( requestedState == 1U )
+        else if ( requestedState == TRUE )
         {
-            if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_STATE == currentDialysisState ) )
+            if ( ( MODE_TREA == currMode ) &&
+                 ( TREATMENT_DIALYSIS_STATE == trtState ) &&
+                 ( DIALYSIS_UF_STATE == currentDialysisState ) )
             {
                 ufPauseRequested = TRUE;
                 response.accepted = TRUE;
+
                 if ( setUFRateLHr > 0.0F )
                 {
-                    //sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateLHr, 0.0 );
+                    // sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateLHr, 0.0F );
                 }
             }
+            else if ( MODE_TREA != currMode )
+            {
+                response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
+            }
+            else if ( TREATMENT_DIALYSIS_STATE != trtState )
+            {
+                response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
+            }
             else
             {
-                if ( MODE_TREA != currMode )
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
-                }
-                else if ( TREATMENT_DIALYSIS_STATE != trtState )
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
-                }
-                else
-                {
-                    response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS;
-                }
+                response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS;
             }
         }
         else
-            {
-                response.rejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
-            }
-    }
-    else
         {
-        response.rejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
+            response.rejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         }
+    }
+    else
+    {
+        response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+    }
 
-    // Send response w/ reason code if rejected
+    // Send response
     sendMessage( MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&response), sizeof( UI_RESPONSE_PAYLOAD_T ) );
 
     return response.accepted;