Index: dialin/common/ui_defs.py
===================================================================
diff -u -ra505f80795643e531cb0b0120a38a7765cbf7b9c -r05f820aab61851f5c0ee8c4c95d047d50d6f0a2c
--- dialin/common/ui_defs.py	(.../ui_defs.py)	(revision a505f80795643e531cb0b0120a38a7765cbf7b9c)
+++ dialin/common/ui_defs.py	(.../ui_defs.py)	(revision 05f820aab61851f5c0ee8c4c95d047d50d6f0a2c)
@@ -68,7 +68,9 @@
 
     String = 65279
     Acknow = 65535
-    AcknowGeneric = 0  # Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
+    # Generic Acknowledgment is not a unique message ID and
+    # inherits its Id from the actual message. Zero is a placeholder
+    AcknowGeneric = 0
 
 
 class GuiActionTypeLength:
@@ -78,18 +80,18 @@
 class TXStates:
     # Sub Mode
     TREATMENT_START_STATE = 0           # Start treatment - initialize treatment and go to blood prime state
-    TREATMENT_BLOOD_PRIME_STATE = 1     # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place.  No treatment time.
-    TREATMENT_DIALYSIS_STATE = 2        # Perform dialysis.  Deliver Heparin as prescribed.  Deliver UF as prescribed.  Handle saline boluses as requested
+    TREATMENT_BLOOD_PRIME_STATE = 1     # Prime blood-side of dialyzer with gradual ramp for 1 min.
+    TREATMENT_DIALYSIS_STATE = 2        # Perform dialysis.
     TREATMENT_STOP_STATE = 3            # Treatment stopped.  All pumps off.  Dializer bypassed
     TREATMENT_RINSEBACK_STATE = 4       # Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
-    TREATMENT_RECIRC_STATE = 5          # Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
-    TREATMENT_END_STATE = 6             # Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
+    TREATMENT_RECIRC_STATE = 5          # Recirculate saline and dialysate while patient disconnected
+    TREATMENT_END_STATE = 6             # Dialysis has ended
 
     # Saline states
     SALINE_BOLUS_STATE_IDLE = 0                 # No saline bolus delivery is in progress
     SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1  # Wait for pumps to stop before starting bolus
     SALINE_BOLUS_STATE_IN_PROGRESS = 2          # A saline bolus delivery is in progress
-    SALINE_BOLUS_STATE_MAX_DELIVERED = 3        # Maximum saline bolus volume reached - no more saline bolus deliveries allowed
+    SALINE_BOLUS_STATE_MAX_DELIVERED = 3        # Maximum saline bolus volume reached
 
     # UF states
     UF_START_STATE = 0          # Start state of the ultrafiltration state machine
@@ -111,7 +113,7 @@
     RINSEBACK_RUN_STATE = 1             # Rinseback running state of the rinseback sub-mode state machine
     RINSEBACK_PAUSED_STATE = 2          # Rinseback paused state of the rinseback sub-mode state machine
     RINSEBACK_STOP_STATE = 3            # Rinseback stopped (done) state of the rinseback sub-mode state machine
-    RINSEBACK_RUN_ADDITIONAL_STATE = 4  # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
+    RINSEBACK_RUN_ADDITIONAL_STATE = 4  # Additional rinseback volume (10 mL) state
 
     # Recirculate
     TREATMENT_RECIRC_RECIRC_STATE = 0   # Re-circulate state of the treatment re-circulate sub-mode state machine
@@ -125,8 +127,8 @@
     TREATMENT_END_PAUSED_STATE = 1              # Paused state of the treatment end sub-mode state machine
 
     # Treatment Stop
-    TREATMENT_STOP_RECIRC_STATE = 0             # Dialysate re-circulation state of the treatment stop sub-mode state machine
-    TREATMENT_STOP_NO_RECIRC_STATE = 1          # No dialysate re-circulation state of the treatment stop sub-mode state machine
+    TREATMENT_STOP_RECIRC_STATE = 0             # Dialysate re-circulation state
+    TREATMENT_STOP_NO_RECIRC_STATE = 1          # No dialysate re-circulation state
 
 
 class TreatmentParameterRejections: