diff --git a/src/control_backend/agents/user_interrupt/user_interrupt_agent.py b/src/control_backend/agents/user_interrupt/user_interrupt_agent.py
index 462d94f..90f4e7a 100644
--- a/src/control_backend/agents/user_interrupt/user_interrupt_agent.py
+++ b/src/control_backend/agents/user_interrupt/user_interrupt_agent.py
@@ -36,13 +36,11 @@ class UserInterruptAgent(BaseAgent):
         self._trigger_map = {}
         self._trigger_reverse_map = {}
 
-        self._goal_map = {}
-        self._goal_reverse_map = {}
+        self._goal_map = {}  # id -> sluggified goal
+        self._goal_reverse_map = {}  # sluggified goal -> id
 
-        self._cond_norm_map = {}
-        self._cond_norm_reverse_map = {}
-
-        self._belief_condition_map = {}
+        self._cond_norm_map = {}  # id -> sluggified cond norm
+        self._cond_norm_reverse_map = {}  # sluggified cond norm -> id
 
     async def setup(self):
         """
@@ -61,7 +59,6 @@ class UserInterruptAgent(BaseAgent):
         self.pub_socket.connect(settings.zmq_settings.internal_pub_address)
 
         self.add_behavior(self._receive_button_event())
-        # self.add_behavior(self.test_sending_behaviour())
 
     async def _receive_button_event(self):
         """
@@ -157,13 +154,10 @@ class UserInterruptAgent(BaseAgent):
                     payload = {"type": "goal_update", "id": ui_id, "active": True}
                     await self._send_experiment_update(payload)
                     self.logger.info(f"UI Update: Goal {goal_name} started (ID: {ui_id})")
-                else:
-                    self.logger.warning(f"Goal start received for unknown goal : {goal_name}")
             case "active_norms_update":
                 asl_slugs = [s.strip() for s in msg.body.split(";")]
 
                 await self._broadcast_cond_norms(asl_slugs)
-
             case _:
                 self.logger.debug(f"Received internal message on unhandled thread: {msg.thread}")
 
@@ -184,6 +178,9 @@ class UserInterruptAgent(BaseAgent):
         self.logger.debug(f"Broadcasted state for {len(updates)} conditional norms.")
 
     def _create_mapping(self, program_json: str):
+        """
+        Create mappings between UI IDs and ASL slugs for triggers, goals, and conditional norms
+        """
         try:
             program = Program.model_validate_json(program_json)
             self._trigger_map = {}