diff --git a/cogs/fitwide/cog.py b/cogs/fitwide/cog.py
index 012c1db3..ea074e8c 100644
--- a/cogs/fitwide/cog.py
+++ b/cogs/fitwide/cog.py
@@ -511,8 +511,11 @@ async def generate_vyucujici_info(self, inter: disnake.ApplicationCommandInterac
             for semester_name in features.CATEGORIES_NAMES
         ]
 
+        # TODO remove in production
         # Remove None values
         categories = [category for category in categories if category is not None]
+
+        # Check if all categories were found
         if None in categories:
             await inter.edit_original_response(MessagesCZ.gen_teacher_info_inv_catg)
             return
@@ -530,6 +533,7 @@ async def generate_vyucujici_info(self, inter: disnake.ApplicationCommandInterac
             await inter.edit_original_response(MessagesCZ.gen_teacher_info_channel_none)
             return
 
+        # Clear channel before sending new data
         await teacher_info_channel.purge()
         await teacher_info_channel.send(MessagesCZ.gen_teacher_info_header)
 
@@ -555,10 +559,11 @@ async def generate_vyucujici_info(self, inter: disnake.ApplicationCommandInterac
 
                     channel_teachers.append(user)
 
-                # TODO send one message per channel for easier management
                 if channel_teachers:
-                    await teacher_info_channel.send(f"**{channel.name.upper()}:**")
+                    message = f"**{channel.name.upper()}:**\n"
                     for teacher in channel_teachers:
-                        await teacher_info_channel.send(f"- {teacher.mention}")
+                        # TODO add teacher's full name
+                        message += f"- {teacher.mention}\n"
+                    await teacher_info_channel.send(message)
 
         await inter.edit_original_response(MessagesCZ.gen_teacher_info_success)