diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs
index 7e0099c..19a4a57 100644
--- a/src/app_data/mod.rs
+++ b/src/app_data/mod.rs
@@ -313,9 +313,7 @@ impl AppData {
     /// So can display nicely and evenly
     pub fn get_width(&self) -> Columns {
         let mut output = Columns::new();
-		// Think this is causing issues
         let count = |x: &String| x.chars().count();
-		// let count = |_:&String|10;
 
         for container in &self.containers.items {
             let cpu_count = count(
@@ -412,7 +410,7 @@ impl AppData {
     }
 
     /// Update, or insert, containers
-    pub fn update_containers(&mut self, containers: &[ContainerSummary]) {
+    pub fn update_containers(&mut self, containers: &mut [ContainerSummary]) {
         let all_ids = self.get_all_ids();
 
         if !containers.is_empty() && self.containers.state.selected().is_none() {
@@ -437,47 +435,58 @@ impl AppData {
             }
         }
 
-        for i in containers.iter() {
+        for i in containers.iter_mut() {
             if let Some(id) = i.id.as_ref() {
-				// maybe if no name then continue?
-                let name = i.names.as_ref().map_or("".to_owned(), |f|f.get(0).map_or("".to_owned(), |f|{
-					let mut n = f.clone();
-					if n.starts_with('/') {
-						n.remove(0);
-					}
-					n
-			}));
-				
-                let state = State::from(i.state.as_ref().map_or("dead".to_owned(), |f|f.trim().to_owned()));
-                let status = i.status.as_ref().map_or("".to_owned(), |f| f.trim().to_owned());
-				let image = i.image.as_ref().map_or("".to_owned(), |f|f.clone());
-				
+                // maybe if no name then continue?
+                let name = i.names.as_mut().map_or("".to_owned(), |n| {
+                    n.get_mut(0).map_or("".to_owned(), |f| {
+                        if f.starts_with('/') {
+                            f.remove(0);
+                        }
+                        f.to_string()
+                    })
+                });
+
+                let state = State::from(
+                    i.state
+                        .as_ref()
+                        .map_or("dead".to_owned(), |f| f.trim().to_owned()),
+                );
+                let status = i
+                    .status
+                    .as_ref()
+                    .map_or("".to_owned(), |f| f.trim().to_owned());
+
+                let image = i.image.as_ref().map_or("".to_owned(), |f| f.clone());
+
                 if let Some(current_container) = self.get_container_by_id(id) {
-					if current_container.name != name {
-						current_container.name = name;
+                    if current_container.name != name {
+                        current_container.name = name;
                     };
                     if current_container.status != status {
-						current_container.status = status;
+                        current_container.status = status;
                     };
                     if current_container.state != state {
-						current_container.docker_controls.items = DockerControls::gen_vec(&state);
-						
+                        current_container.docker_controls.items = DockerControls::gen_vec(&state);
+
                         // Update the list state, needs to be None if the gen_vec returns an empty vec
                         match state {
-							State::Removing | State::Restarting | State::Unknown => {
-								current_container.docker_controls.state.select(None);
+                            State::Removing | State::Restarting | State::Unknown => {
+                                current_container.docker_controls.state.select(None);
                             }
                             _ => current_container.docker_controls.start(),
                         };
                         current_container.state = state;
                     };
                     if current_container.image != image {
+                        // limit image name to 64 chars?
                         // current_container.image = image.chars().into_iter().take(64).collect();
-						current_container.image = image;
+                        current_container.image = image;
                     };
                 } else {
+                    // limit image name to 64 chars?
                     // let mut container = ContainerItem::new(id.clone(), status,  image.chars().into_iter().take(64).collect(), state, name);
-					let mut container = ContainerItem::new(id.clone(), status, image, state, name);
+                    let mut container = ContainerItem::new(id.clone(), status, image, state, name);
                     container.logs.end();
                     self.containers.items.push(container);
                 }
@@ -507,7 +516,7 @@ impl AppData {
             }
 
             if container.logs.state.selected().is_none()
-                || container.logs.state.selected().unwrap_or_default() + 1 == current_len
+                || container.logs.state.selected().map_or(1, |f| f + 1) == current_len
             {
                 container.logs.end();
             }
diff --git a/src/app_error.rs b/src/app_error.rs
index 767b204..b1bcd83 100644
--- a/src/app_error.rs
+++ b/src/app_error.rs
@@ -27,6 +27,5 @@ impl fmt::Display for AppError {
                 write!(f, "Unbale to {}able mouse capture", reason)
             }
         }
-        
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 37b6919..f4b67b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,7 +28,7 @@ use ui::{create_ui, GuiState};
 
 fn setup_tracing() {
     tracing_subscriber::fmt().with_max_level(Level::INFO).init();
-	// TODO write to file?
+    // TODO write to file?
 }
 
 #[tokio::main]
@@ -100,7 +100,7 @@ async fn main() {
         .unwrap_or(());
     } else {
         loop {
-			// TODO this needs to be improved to display something useful
+            // TODO this needs to be improved to display something useful
             info!("in debug mode");
             tokio::time::sleep(std::time::Duration::from_millis(5000)).await;
         }
diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs
index 30d594a..1573a37 100644
--- a/src/ui/draw_blocks.rs
+++ b/src/ui/draw_blocks.rs
@@ -279,8 +279,8 @@ pub fn chart<B: Backend>(
                 .style(Style::default().fg(Color::Cyan))
                 .graph_type(GraphType::Line)
                 .data(&mem.0)];
-            let cpu_stats = CpuStats::new(cpu.0.last().unwrap_or(&(0.00, 0.00)).1);
-            let mem_stats = ByteStats::new(mem.0.last().unwrap_or(&(0.0, 0.0)).1 as u64);
+            let cpu_stats = CpuStats::new(cpu.0.last().map_or(0.00, |f| f.1));
+            let mem_stats = ByteStats::new(mem.0.last().map_or(0, |f| f.1 as u64));
             let cpu_chart = make_chart(&cpu.2, "cpu", cpu_dataset, &cpu_stats, &cpu.1);
             let mem_chart = make_chart(&mem.2, "memory", mem_dataset, &mem_stats, &mem.1);
 
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index ba02a91..d717910 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -63,7 +63,7 @@ pub async fn create_ui(
         LeaveAlternateScreen,
         DisableMouseCapture
     )?;
-    terminal.show_cursor().unwrap_or(());
+    terminal.show_cursor()?;
 
     if let Err(err) = res {
         println!("{}", err);