Index: leahi_dialin/td/modules/events.py
===================================================================
diff -u -r7d9d004527efeccb91958b440abdff08c2c52648 -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93
--- leahi_dialin/td/modules/events.py	(.../events.py)	(revision 7d9d004527efeccb91958b440abdff08c2c52648)
+++ leahi_dialin/td/modules/events.py	(.../events.py)	(revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93)
@@ -7,21 +7,24 @@
 #
 # @file    events.py
 #
-# @author  (last)      Jonny Paguio
-# @date    (last)      16-Sep-2025
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      08-Jan-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  12-Oct-2021
 #
 ############################################################################
 
 import struct
 from logging import Logger
-from leahi_dialin.common import *
+from datetime import datetime
+from time import time
+
+from leahi_dialin.common.td_defs import TDEventList, TDEventDataType, TDOpModes, TDFaultStates, \
+    TDServiceStates, TDInitStates, TDStandbyStates, TDTreatmentParamStates, TDPreTreatmentModesStates, \
+    TDTreatmentStates, TDPostTreatmentStates, TDNotLegalStates
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
-from datetime import datetime
-from time import time
 
 
 class TDEvents(AbstractSubSystem):
@@ -90,6 +93,7 @@
 
             self._td_event_data_type[event_data_type] = struct_unpack_type
 
+
     def get_td_nth_event(self, event_id, event_number=0):
         """
         Returns the nth requested TD event
@@ -110,6 +114,7 @@
 
         return event
 
+
     def clear_td_event_list(self):
         """
         Clears the TD event list
@@ -119,6 +124,7 @@
         for key in self._td_event_dictionary:
             self._td_event_dictionary[key].clear()
 
+
     def get_td_events(self, event_id, number_of_events=1):
         """
         Returns the requested number of a certain TD event ID
@@ -146,6 +152,7 @@
 
         return list_of_events
 
+
     @publish(["msg_id_td_event", "td_events_timestamp", '_td_event_dictionary'])
     def _handler_events_sync(self, message, timestamp=0.0):
         """
@@ -285,6 +292,7 @@
         self._td_event_dictionary[event_state_name].append(event_tuple)
         self.td_events_timestamp = timestamp
 
+
     @publish(["msg_id_td_op_mode_data", "td_event_op_mode_timestamp", "td_event_op_mode", "td_event_sub_mode"])
     def _handler_td_op_mode_sync(self, message, timestamp=0.0):
         """
@@ -302,4 +310,4 @@
 
         self.td_event_op_mode = mode[0]
         self.td_event_sub_mode = smode[0]
-        self.td_event_op_mode_timestamp = timestamp
\ No newline at end of file
+        self.td_event_op_mode_timestamp = timestamp