diff --git a/src/main/java/com/github/polpetta/mezzotre/telegram/callbackquery/Dispatcher.java b/src/main/java/com/github/polpetta/mezzotre/telegram/callbackquery/Dispatcher.java
index a27d181..cf3f67e 100644
--- a/src/main/java/com/github/polpetta/mezzotre/telegram/callbackquery/Dispatcher.java
+++ b/src/main/java/com/github/polpetta/mezzotre/telegram/callbackquery/Dispatcher.java
@@ -53,6 +53,8 @@ public class Dispatcher {
                     .flatMap(
                         eventName ->
                             tgEventProcessors.stream()
+                                // FIXME that fucking stupid, why iterate over, just use a map! Make
+                                // mapping at startup then we're gucci for the rest of the run
                                 .filter(processor -> processor.getEventName().equals(eventName))
                                 .findAny())
                     .map(processor -> processor.process(callbackQueryContext, update))
diff --git a/src/main/java/com/github/polpetta/mezzotre/telegram/command/Router.java b/src/main/java/com/github/polpetta/mezzotre/telegram/command/Router.java
index 848c4d3..69ca7b9 100644
--- a/src/main/java/com/github/polpetta/mezzotre/telegram/command/Router.java
+++ b/src/main/java/com/github/polpetta/mezzotre/telegram/command/Router.java
@@ -61,6 +61,8 @@ public class Router {
                     .flatMap(
                         command ->
                             tgCommandProcessors.stream()
+                                // FIXME that fucking stupid, why iterate over, just use a map! Make
+                                // mapping at startup then we're gucci for the rest of the run
                                 .filter(ex -> ex.getTriggerKeyword().equals(command))
                                 .findAny())
                     .map(executor -> executor.process(chat, update))