diff --git a/src/app/command_interface.rs b/src/app/command_interface.rs
index 6f09452..4ed0eba 100644
--- a/src/app/command_interface.rs
+++ b/src/app/command_interface.rs
@@ -1,7 +1,6 @@
 // FIXME: This file needs documentation with examples of how the proc macros work.
 // for now use `cargo expand app::command_interface` for an overview
 use lua_macros::{ci_command, turn_struct_to_ci_commands};
-use rlua::Context;
 
 use super::events::event_types::Event;
 
diff --git a/src/app/events/event_types/event/handlers/mod.rs b/src/app/events/event_types/event/handlers/mod.rs
index d3fe26c..98b60ad 100644
--- a/src/app/events/event_types/event/handlers/mod.rs
+++ b/src/app/events/event_types/event/handlers/mod.rs
@@ -1,4 +1,11 @@
-pub mod command;
-pub mod main;
-pub mod matrix;
+// input events
 pub mod setup;
+pub mod main;
+
+// matrix
+pub mod matrix;
+
+// ci
+pub mod ci_output;
+pub mod command;
+pub mod lua_command;
diff --git a/src/app/status.rs b/src/app/status.rs
index 430f8a8..2a858f9 100644
--- a/src/app/status.rs
+++ b/src/app/status.rs
@@ -1,5 +1,5 @@
 use anyhow::{Error, Result};
-use cli_log::{warn, info};
+use cli_log::warn;
 use indexmap::IndexMap;
 use matrix_sdk::{
     room::MessagesOptions,