diff --git a/fsfwgen/returnvalues/returnvalues_parser.py b/fsfwgen/returnvalues/returnvalues_parser.py
index 8e4323a..7a03be2 100644
--- a/fsfwgen/returnvalues/returnvalues_parser.py
+++ b/fsfwgen/returnvalues/returnvalues_parser.py
@@ -111,6 +111,7 @@ class InterfaceParser(FileParser):
     def __assign_start_end_indexes(
         start_name_list_list, end_name_list_list
     ) -> Tuple[List, List]:
+        # TODO: Clean up this mess. Use a wrapper/helper class instead of wild list/indexes
         start_list_list_completed = start_name_list_list
         end_list_list_completed = end_name_list_list
         all_indexes_filled = False