Index: leahi_dialin/dd/modules/events.py
===================================================================
diff -u -r7ec1428451adfb2aabf7a64794e818a9916250c7 -rdd92f40a5a5b13449356328cf2526dd948c587ad
--- leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 7ec1428451adfb2aabf7a64794e818a9916250c7)
+++ leahi_dialin/dd/modules/events.py	(.../events.py)	(revision dd92f40a5a5b13449356328cf2526dd948c587ad)
@@ -61,7 +61,7 @@
         self.sub_mode = 0                                               #: The new Operation Sub-Mode value
         self.event_op_mode_timestamp = 0.0                              #: The timestamp of the last Operation Mode change message
 
-        # Dictionary of the mode as key and the sub mode states enum class as the value
+        # Dictionary of the mode as key and the sub mode enum class as the value
         self._op_mode_2_sub_mode = {dd_enum_repository.DDOpModes.MODE_FAUL.name: dd_enum_repository.DDFaultStates,
                                     dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceStates,
                                     dd_enum_repository.DDOpModes.MODE_INIT.name: dd_enum_repository.DDInitStates,
@@ -74,12 +74,12 @@
                                     dd_enum_repository.DDOpModes.MODE_ROPS.name: dd_enum_repository.DDROPermeateStates,
                                     dd_enum_repository.DDOpModes.MODE_NLEG.name: dd_enum_repository.DDNotLegalStates}
 
-        # Dictionary of the sub mode as key and the state states enum class as the valued
+        # Dictionary of the sub-mode as key and the state enum class as the value
         self._sub_mode_2_states = { dd_enum_repository.DDFaultStates.DD_FAULT_STATE_START.name: dd_enum_repository.DDFaultNVDataStates,
                                     dd_enum_repository.DDStandbyStates.DD_STANDBY_MODE_STATE_IDLE.name: dd_enum_repository.DDStanDisinfectStates,
                                     dd_enum_repository.DDPreGenDialysateStates.DD_PRE_GEN_WET_SELF_TEST.name: dd_enum_repository.DDPreGenWetSelfTestStates }
 
-        # Dictionary of the state as key and the sub state states enum class as the valued
+        # Dictionary of the state as key and the sub-state enum class as the value
         self._state_2_sub_states = { }
 
         # Loop through the list of the DD events enums and initial the event dictionary. Each event is a key in the