diff --git a/src/cli/args.rs b/src/cli/args.rs
index 4d1dba97b2d30fd1f994ecd8bc3ac607d7cb894d..69601313af82afaff7c88260f7aa59f6fdfe7405 100644
--- a/src/cli/args.rs
+++ b/src/cli/args.rs
@@ -1,7 +1,10 @@
 use std::path::PathBuf;
 
 use clap::{Parser, Subcommand};
-use collective::{cli::{AppOpts, ConfigurableAppOpts}, config::ConfigFileFormat};
+use collective::{
+  cli::{AppOpts, ConfigurableAppOpts},
+  config::ConfigFileFormat,
+};
 use espresso::config::Config;
 
 #[derive(Parser)]
@@ -50,4 +53,4 @@ impl ConfigurableAppOpts<Config> for Opts {
       vec![]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/cli/bundle.rs b/src/cli/bundle.rs
index e7773f142546e81272b6f4c25081e0f8fca53a0c..0ede3af227d100381e9d51560925c66d8f935091 100644
--- a/src/cli/bundle.rs
+++ b/src/cli/bundle.rs
@@ -1,6 +1,9 @@
 use std::sync::Arc;
 
-use espresso::{config::Config, bundle::{Bundler, packager}};
+use espresso::{
+  bundle::{packager, Bundler},
+  config::Config,
+};
 
 use super::args::BundleOpts;
 
@@ -10,4 +13,4 @@ pub async fn bundle(config: Arc<Config>, opts: BundleOpts) -> Result<(), package
   bundler.package(opts.source_path).await.unwrap();
 
   Ok(())
-}
\ No newline at end of file
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index f00b6dc5d8bec8c363d10880bed8d3beca4cf8d8..605e7370d8aec7ae7dcbafaeff26a08e482742cc 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,3 +1,3 @@
 pub mod args;
 pub mod bundle;
-pub mod serve;
\ No newline at end of file
+pub mod serve;
diff --git a/src/cli/serve.rs b/src/cli/serve.rs
index 47ab754eea1da7061775e5e6c7a8f698e3963d03..50911db28f826f4f380fe018d291c370965fb457 100644
--- a/src/cli/serve.rs
+++ b/src/cli/serve.rs
@@ -1,9 +1,20 @@
-use std::{sync::{Arc, mpsc}, collections::HashSet};
 use actix::System;
-use collective::thread::{monitor::{ThreadMonitor, self}, self};
-use espresso::{config::Config, bundle::{Unbundler, self}, server::{Server, self}, stats::{StatsServer, self}};
+use collective::thread::{
+  self,
+  monitor::{self, ThreadMonitor},
+};
+use espresso::{
+  bundle::{self, Unbundler},
+  config::Config,
+  server::{self, Server},
+  stats::{self, StatsServer},
+};
 use lazy_static::lazy_static;
-use snafu::{Snafu, ResultExt};
+use snafu::{ResultExt, Snafu};
+use std::{
+  collections::HashSet,
+  sync::{mpsc, Arc},
+};
 use tokio::sync::RwLock;
 
 lazy_static! {
@@ -12,18 +23,10 @@ lazy_static! {
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-  Unbundle {
-    source: bundle::Error,
-  },
-  ServeError {
-    source: Box<server::Error>,
-  },
-  ServeStats {
-    source: stats::Error,
-  },
-  MonitorError {
-    source: monitor::Error,
-  },
+  Unbundle { source: bundle::Error },
+  ServeError { source: Box<server::Error> },
+  ServeStats { source: stats::Error },
+  MonitorError { source: monitor::Error },
   RecvNotify,
 }