diff --git a/OBSW_TmTcClient.py b/OBSW_TmTcClient.py
index 522d6d93230b559b9922aa1628a6642e40499904..13c98cbcff279d5055dcce9c6102f8a22ada9e46 100644
--- a/OBSW_TmTcClient.py
+++ b/OBSW_TmTcClient.py
@@ -121,8 +121,9 @@ def main():
         SenderAndReceiver.sendQueueTcAndReceiveTmSequentially()
 
     elif g.modeId == g.modeList.UnitTest:
-        # Set up test suite and run it with runner
-        # Verbosity specifies detail level
+        """
+        Set up test suite and run it with runner. Verbosity specifies detail level
+        """
         # noinspection PyTypeChecker
         suite = unittest.TestLoader().loadTestsFromModule(OBSW_PusServiceTest)
         unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/utility/OBSW_ExitHandler.py b/utility/OBSW_ExitHandler.py
index 19c082ebf6b5daaf4109e56d8d5e473650e815f8..94d5817b3ec8ea1582491c6d4426d3fc36f0f6df 100644
--- a/utility/OBSW_ExitHandler.py
+++ b/utility/OBSW_ExitHandler.py
@@ -1,4 +1,5 @@
 import signal
+from comIF.OBSW_ComInterface import ComIF_T
 
 
 class GracefulKiller:
@@ -13,7 +14,7 @@ class GracefulKiller:
         print("I was killed")
 
 
-def keyboardInterruptHandler(comInterface):
+def keyboardInterruptHandler(comInterface: ComIF_T):
     print("Disconnect registered")
     # Unit Test closes Serial Port at the end
     # We could do some optional stuff here