diff --git a/src/main.rs b/src/main.rs
index 43f96e3..905b3d7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,45 +1,18 @@
 use std::io::{self, Read};
 use std::time::Duration;
 
-use crossterm::cursor::Show;
 use crossterm::event::{self, Event, KeyCode};
 use crossterm::execute;
-use crossterm::terminal::{
-    EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode,
-};
+use crossterm::terminal::{EnterAlternateScreen, enable_raw_mode};
 use ratatui::Terminal;
 use ratatui::backend::CrosstermBackend;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::style::Style;
 use ratatui::widgets::{Block, Borders, List, ListItem, ListState};
 
-// RAII guard to ensure terminal is restored on panic/unwind
-struct TerminalModeGuard {
-    // track whether we still need to clean up
-    active: bool,
-}
+mod terminal_guard;
+use terminal_guard::TerminalModeGuard;
 
-impl TerminalModeGuard {
-    fn new() -> Self {
-        TerminalModeGuard { active: true }
-    }
-
-    fn cleanup(&mut self) {
-        if !self.active {
-            return;
-        }
-        let _ = disable_raw_mode();
-        let mut stdout = std::io::stdout();
-        let _ = execute!(stdout, LeaveAlternateScreen, Show);
-        self.active = false;
-    }
-}
-
-impl Drop for TerminalModeGuard {
-    fn drop(&mut self) {
-        self.cleanup();
-    }
-}
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut input = String::new();
     io::stdin().read_to_string(&mut input)?;
@@ -78,8 +51,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .iter()
                 .enumerate()
                 .map(|(i, l)| {
-                    let prefix = if marked[i] { "[x]" } else { "[ ]" };
-                    ListItem::new(format!("{} {}", prefix, l))
+                    let prefix = if marked[i] { 'x' } else { ' ' };
+                    ListItem::new(format!("[{prefix}] {l}"))
                 })
                 .collect();
 
diff --git a/src/terminal_guard.rs b/src/terminal_guard.rs
new file mode 100644
index 0000000..21ff79b
--- /dev/null
+++ b/src/terminal_guard.rs
@@ -0,0 +1,29 @@
+use crossterm::cursor::Show;
+use crossterm::execute;
+use crossterm::terminal::{LeaveAlternateScreen, disable_raw_mode};
+
+pub struct TerminalModeGuard {
+    active: bool,
+}
+
+impl TerminalModeGuard {
+    pub fn new() -> Self {
+        Self { active: true }
+    }
+
+    pub fn cleanup(&mut self) {
+        if !self.active {
+            return;
+        }
+        let _ = disable_raw_mode();
+        let mut stdout = std::io::stdout();
+        let _ = execute!(stdout, LeaveAlternateScreen, Show);
+        self.active = false;
+    }
+}
+
+impl Drop for TerminalModeGuard {
+    fn drop(&mut self) {
+        self.cleanup();
+    }
+}