Index: dialin/hd/alarms.py
===================================================================
diff -u -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 -r565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020)
@@ -115,10 +115,9 @@
 
     def get_current_alarm_priority(self):
         """
-        Gets the current alarms priority state.
-        None, Low, Medium, or High
+        Gets the current alarms state.
 
-        @return: (str) the current alarms state in text form.
+        @return: (int) the current alarms state.
         """
         return self.alarms_state
 
Index: dialin/hd/pretreatment.py
===================================================================
diff -u -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 -r565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020
--- dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821)
+++ dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020)
@@ -242,31 +242,14 @@
         self.pre_treatment_wet_self_test_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
 
-        if PreTreatmentSubModes.has_value(pt_submode):
-            self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).value
+        self.pre_treatment_submode = pt_submode
+        self.pre_treatment_sample_water_state = pt_sw_state
+        self.pre_treatment_consumable_self_test_state = pt_consumable_st_state
+        self.pre_treatment_no_cart_self_test_state = pt_no_cart_st_state
+        self.pre_treatment_dry_self_test_state = pt_dry_st_state
+        self.pre_treatment_prime_state = pt_prime_state
+        self.pre_treatment_recirc_state = pt_recirc_state
 
-        if PreTreatmentSampleWaterStates.has_value(pt_sw_state):
-            self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).value
-
-        if PreTreatmentConsumableSelfTestStates.has_value(pt_consumable_st_state):
-            self.pre_treatment_consumable_self_test_state = PreTreatmentConsumableSelfTestStates(
-                pt_consumable_st_state).value
-
-        if PreTreatmentNoCartSelfTestStates.has_value(pt_no_cart_st_state):
-            self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).value
-
-        if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
-
-        if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
-
-        if PreTreatmentPrimeStates.has_value(pt_prime_state):
-            self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).value
-
-        if PreTreatmentRecircStates.has_value(pt_recirc_state):
-            self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).value
-
     @publish([
         "no_cart_self_test_timeout",
         "no_cart_self_test_time_countdown"