diff --git a/boot_diags/src/app.rs b/boot_diags/src/app.rs
index c6d7caf..2f9496c 100644
--- a/boot_diags/src/app.rs
+++ b/boot_diags/src/app.rs
@@ -161,7 +161,7 @@ impl App {
                 if let Some(boot_index) = self.clone.part_index_boot {
                     if let Ok(task) = boot::set_mode(
                         disk.get_part_letter(boot_index).as_str(),
-                        boot_mode,
+                        &boot_mode,
                         &self.system32,
                         &disk.part_type,
                     ) {
@@ -894,7 +894,7 @@ fn build_right_items(app: &App) -> Action {
                             line_colors: vec![Color::Reset],
                         },
                     ]);
-                    header_lines.append(&mut get_disk_description_right(disk, Some(parts)));
+                    header_lines.append(&mut get_disk_description_right(disk, &Some(parts)));
 
                     // Add header
                     if !header_lines.is_empty() {
@@ -957,7 +957,7 @@ fn build_right_items(app: &App) -> Action {
             let disk_list = app.clone.disk_list.lock().unwrap();
             disk_list
                 .iter()
-                .for_each(|disk| items.push(get_disk_description_right(disk, None)));
+                .for_each(|disk| items.push(get_disk_description_right(disk, &None)));
         }
         Mode::SelectParts => {
             ["Boot", "OS"].iter().for_each(|s| {
@@ -971,7 +971,7 @@ fn build_right_items(app: &App) -> Action {
                 let disk_list = app.clone.disk_list.lock().unwrap();
                 if let Some(disk) = disk_list.get(index) {
                     // Disk Details
-                    items.push(get_disk_description_right(disk, None));
+                    items.push(get_disk_description_right(disk, &None));
 
                     // Partition Details
                     disk.parts
diff --git a/deja_vu/src/app.rs b/deja_vu/src/app.rs
index d77d901..c0f9fb6 100644
--- a/deja_vu/src/app.rs
+++ b/deja_vu/src/app.rs
@@ -127,8 +127,7 @@ impl App {
 
     pub fn next_mode(&mut self) -> Option<Mode> {
         let new_mode = match self.cur_mode {
-            Mode::Home => Mode::ScanDisks,
-            Mode::InstallDrivers => Mode::ScanDisks,
+            Mode::Home | Mode::InstallDrivers => Mode::ScanDisks,
             Mode::ScanDisks => Mode::SelectDisks,
             Mode::SelectDisks => Mode::SelectTableType,
             Mode::SelectTableType => Mode::Confirm,
@@ -236,7 +235,7 @@ impl App {
 
                         // Create boot files
                         for task in
-                            boot::configure_disk(&letter_boot, &letter_os, &system32, table_type)
+                            boot::configure_disk(&letter_boot, &letter_os, &system32, &table_type)
                         {
                             self.tasks.add(task);
                         }
@@ -424,7 +423,7 @@ impl App {
                                         0 => Some(PartitionTableType::Guid),
                                         1 => Some(PartitionTableType::Legacy),
                                         index => {
-                                            panic!("Failed to select PartitionTableType: {}", index)
+                                            panic!("Failed to select PartitionTableType: {index}")
                                         }
                                     }
                                 } else {
@@ -747,21 +746,21 @@ fn build_right_items(app: &App, cur_mode: Mode) -> Action {
             let disk_list = app.clone.disk_list.lock().unwrap();
             disk_list
                 .iter()
-                .for_each(|disk| items.push(get_disk_description_right(disk, None)));
+                .for_each(|disk| items.push(get_disk_description_right(disk, &None)));
         }
         Mode::SelectParts => {
-            ["Boot", "OS"].iter().for_each(|s| {
+            for s in &["Boot", "OS"] {
                 labels.push(vec![DVLine {
                     line_parts: vec![String::from(*s)],
                     line_colors: vec![Color::Cyan],
-                }])
-            });
+                }]);
+            }
             if let Some(index) = app.clone.disk_index_dest {
                 start_index = 1;
                 let disk_list = app.clone.disk_list.lock().unwrap();
                 if let Some(disk) = disk_list.get(index) {
                     // Disk Details
-                    items.push(get_disk_description_right(disk, None));
+                    items.push(get_disk_description_right(disk, &None));
 
                     // Partition Details
                     disk.parts
diff --git a/deja_vu/src/main.rs b/deja_vu/src/main.rs
index 514c60a..1aa1772 100644
--- a/deja_vu/src/main.rs
+++ b/deja_vu/src/main.rs
@@ -29,18 +29,15 @@ async fn main() -> Result<()> {
             msg.replace("Administrator privedges required for Deja-Vu.");
         }
     };
-    match msg {
-        Some(text) => {
-            println!("{text}");
-        }
-        None => {
-            core::errors::init()?;
-            core::logging::init()?;
+    if let Some(text) = msg {
+        println!("{text}");
+    } else {
+        core::errors::init()?;
+        core::logging::init()?;
 
-            let args = core::cli::Cli::parse();
-            let mut app = App::new(args.tick_rate, args.frame_rate)?;
-            app.run().await?;
-        }
+        let args = core::cli::Cli::parse();
+        let mut app = App::new(args.tick_rate, args.frame_rate)?;
+        app.run().await?;
     }
     Ok(())
 }