Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r7ec1428451adfb2aabf7a64794e818a9916250c7 -rdd92f40a5a5b13449356328cf2526dd948c587ad
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 7ec1428451adfb2aabf7a64794e818a9916250c7)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision dd92f40a5a5b13449356328cf2526dd948c587ad)
@@ -59,7 +59,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 = {fp_enum_repository.FPOpModes.MODE_FAUL.name: fp_enum_repository.FPFaultStates,
                                     fp_enum_repository.FPOpModes.MODE_SERV.name: fp_enum_repository.FPServiceStates,
                                     fp_enum_repository.FPOpModes.MODE_INIT.name: fp_enum_repository.FPPostStates,
@@ -70,15 +70,15 @@
                                     fp_enum_repository.FPOpModes.MODE_DEGP.name: fp_enum_repository.FPGenPermeateDefStates,
                                     fp_enum_repository.FPOpModes.MODE_NLEG.name: fp_enum_repository.FPNotLegalStates}
 
-        # 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 = { fp_enum_repository.FPFaultStates.DD_FAULT_STATE_START.name: fp_enum_repository.FPFaultNVDataStates,
                                     fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_INLET_PRES_CHECK.name: fp_enum_repository.FPInletPresCheckStates,
                                     fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_FILTER_FLUSH.name: fp_enum_repository.FPFilterFlushStates,
                                     fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_PERMEATE_FLUSH.name: fp_enum_repository.FPPermeateFlushStates,
                                     fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_CONCENTRATE_FLUSH.name: fp_enum_repository.FPConcentrateFlushStates,
                                     fp_enum_repository.FPPreGenPDefStates.FP_PRE_GENP_DEF_FLUSH.name: fp_enum_repository.FPDefFlushStates }
 
-        # 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 FP events enums and initial the event dictionary. Each event is a key in the