diff --git a/src/bundle/s3/poller.rs b/src/bundle/s3/poller.rs
index 4dc5523e0bb6265421fb860895ff7d8833d778cc..23aef0827d50bef176b260ee6067cc480cf2cc53 100644
--- a/src/bundle/s3/poller.rs
+++ b/src/bundle/s3/poller.rs
@@ -9,8 +9,8 @@ use rusoto_s3::{
   GetObjectError, GetObjectRequest, HeadObjectError, HeadObjectRequest, S3Client, S3,
 };
 use snafu::{ResultExt, Snafu};
-use tokio_tar::Archive;
 use std::path::PathBuf;
+use tokio_tar::Archive;
 
 #[derive(Snafu, Debug)]
 pub enum InternalError {
@@ -148,14 +148,12 @@ impl BundlePoller for S3BundlePoller {
     info!("S3BundlePoller: Unpacking bundle...");
 
     let stream = get_object_response
-    .body
-    .ok_or(InternalError::S3MissingBody)?
-    .into_async_read();
+      .body
+      .ok_or(InternalError::S3MissingBody)?
+      .into_async_read();
 
     // TODO: Write temp file to disk.
-    let mut archive = Archive::new(
-      stream
-    );
+    let mut archive = Archive::new(stream);
 
     archive
       .unpack(path)
diff --git a/src/files/mod.rs b/src/files/mod.rs
index 9eb8f7122b82f443e952851fad92573c2d0f8979..a91534fd448f3027baffdf51229a2a6ebb675843 100644
--- a/src/files/mod.rs
+++ b/src/files/mod.rs
@@ -4,7 +4,7 @@
 use std::cell::RefCell;
 use std::path::PathBuf;
 use std::rc::Rc;
-use std::sync::{Arc};
+use std::sync::Arc;
 
 use actix_service::boxed::{self, BoxServiceFactory};
 use actix_service::{IntoServiceFactory, ServiceFactory, ServiceFactoryExt};
diff --git a/src/files/path_context.rs b/src/files/path_context.rs
index 3e222680f7e838edcfacd5a93d67f3b373d13073..36f5a81bad4ef4b83198c39753f6bcd99818bdc2 100644
--- a/src/files/path_context.rs
+++ b/src/files/path_context.rs
@@ -1,6 +1,6 @@
 use super::directory::index::IndexStrategy;
 use crate::config::{ContentDispositionConfig, PathConfig, PathMatcherConfig, ServerConfig};
-use actix_web::http::header::{DispositionType, HeaderMap, self};
+use actix_web::http::header::{self, DispositionType, HeaderMap};
 use regex::Regex;
 use snafu::{ResultExt, Snafu};
 use std::{
diff --git a/src/files/service.rs b/src/files/service.rs
index 8700c5c47fd4a799006aaf301f43d1c4b6bc7502..0bab998a31d7d965df0609f30ef30a83d291b0e7 100644
--- a/src/files/service.rs
+++ b/src/files/service.rs
@@ -20,16 +20,16 @@ use async_recursion::async_recursion;
 use futures_util::future::LocalBoxFuture;
 use snafu::ResultExt;
 use snafu::Snafu;
-use tokio::sync::RwLock;
 use std::{
   convert::TryInto,
   io,
   ops::Deref,
   path::{Path, PathBuf},
   rc::Rc,
-  sync::{Arc},
+  sync::Arc,
   task::{Context, Poll},
 };
+use tokio::sync::RwLock;
 
 /// Errors which can occur when serving static files.
 #[derive(Snafu, Debug)]
@@ -164,7 +164,10 @@ impl FilesServiceInner {
     }
   }
 
-  async fn get_request_context_for_request(&self, req: &ServiceRequest) -> Result<RequestContext, Error> {
+  async fn get_request_context_for_request(
+    &self,
+    req: &ServiceRequest,
+  ) -> Result<RequestContext, Error> {
     let serve_dir = self.get_serve_dir().await?;
     let path_from_request: UriPathBuf = req.try_into().context(BuildUriPath)?;
 
diff --git a/src/main.rs b/src/main.rs
index a9b2c1e70616ff456bf5aae0de38661a09613cf1..c707a3839c9ee2428b9258a12f9072bcb9e63b8b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,19 +5,22 @@ extern crate log;
 
 use actix::prelude::*;
 use clap::{Parser, Subcommand};
-use collective::{cli::{AppOpts, ConfigurableAppOpts}, config::ConfigFileFormat};
+use collective::{
+  cli::{AppOpts, ConfigurableAppOpts},
+  config::ConfigFileFormat,
+};
 use lazy_static::lazy_static;
 use monitor::Monitor;
 use server::Server;
 use snafu::{ResultExt, Snafu};
 use stats::StatsServer;
-use tokio::sync::RwLock;
 use std::{
   collections::HashSet,
   net::SocketAddr,
   path::PathBuf,
   sync::{mpsc, Arc},
 };
+use tokio::sync::RwLock;
 
 pub mod bundle;
 pub mod config;
diff --git a/src/server.rs b/src/server.rs
index 331fbcd887d7a0a059280b49203f2bcd8d124ad6..dfcbdbff41a2a835eb43f61ecc314b6558f5bfd2 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -12,7 +12,6 @@ use actix_web::{
   App, HttpServer,
 };
 use snafu::{ResultExt, Snafu};
-use tokio::sync::RwLock;
 use std::{
   convert::{TryFrom, TryInto},
   path::PathBuf,
@@ -22,6 +21,7 @@ use std::{
   },
   thread::{JoinHandle, Thread},
 };
+use tokio::sync::RwLock;
 
 #[derive(Debug, Snafu)]
 pub enum Error {