diff --git a/src/lib/core.rs b/src/lib/core.rs
index 2f4d8f715..2fffec58c 100644
--- a/src/lib/core.rs
+++ b/src/lib/core.rs
@@ -15,8 +15,6 @@ use crate::config::Configuration;
 use crate::async_log;
 use crate::audit::AuditScope;
 use crate::be::{Backend, BackendTransaction};
-use crate::schema::Schema;
-use crate::server::QueryServer;
 use crate::error::OperationError;
 use crate::interval::IntervalActor;
 use crate::proto::v1::actors::QueryServerV1;
@@ -25,6 +23,8 @@ use crate::proto::v1::{
     AuthRequest, AuthState, CreateRequest, DeleteRequest, ModifyRequest, SearchRequest,
     UserAuthToken,
 };
+use crate::schema::Schema;
+use crate::server::QueryServer;
 
 use uuid::Uuid;
 
diff --git a/src/lib/entry.rs b/src/lib/entry.rs
index 6143b4910..b83982c02 100644
--- a/src/lib/entry.rs
+++ b/src/lib/entry.rs
@@ -402,7 +402,6 @@ impl<STATE> Entry<EntryNormalised, STATE> {
 }
 
 impl<STATE> Entry<EntryInvalid, STATE> {
-
     // This is only used in tests today, but I don't want to cfg test it.
     #[allow(dead_code)]
     fn get_uuid(&self) -> Option<&String> {
diff --git a/src/lib/event.rs b/src/lib/event.rs
index 1c95a9999..2dd9df6cf 100644
--- a/src/lib/event.rs
+++ b/src/lib/event.rs
@@ -4,8 +4,7 @@ use crate::filter::{Filter, FilterValid};
 use crate::proto::v1::Entry as ProtoEntry;
 use crate::proto::v1::{
     AuthCredential, AuthResponse, AuthState, AuthStep, CreateRequest, DeleteRequest, ModifyRequest,
-    ReviveRecycledRequest, SearchRequest, SearchResponse, UserAuthToken,
-    WhoamiResponse,
+    ReviveRecycledRequest, SearchRequest, SearchResponse, UserAuthToken, WhoamiResponse,
 };
 // use error::OperationError;
 use crate::error::OperationError;
diff --git a/src/lib/idm/account.rs b/src/lib/idm/account.rs
index bec9f7331..072eabdbe 100644
--- a/src/lib/idm/account.rs
+++ b/src/lib/idm/account.rs
@@ -6,7 +6,6 @@ use crate::proto::v1::UserAuthToken;
 use crate::idm::claim::Claim;
 use crate::idm::group::Group;
 
-
 #[derive(Debug, Clone)]
 pub(crate) struct Account {
     // Later these could be &str if we cache entry here too ...
diff --git a/src/lib/idm/claim.rs b/src/lib/idm/claim.rs
index 734b768fd..f456b684d 100644
--- a/src/lib/idm/claim.rs
+++ b/src/lib/idm/claim.rs
@@ -18,4 +18,3 @@ impl Claim {
         unimplemented!();
     }
 }
-
diff --git a/src/lib/idm/server.rs b/src/lib/idm/server.rs
index 7942a832b..8316df914 100644
--- a/src/lib/idm/server.rs
+++ b/src/lib/idm/server.rs
@@ -211,7 +211,9 @@ mod tests {
                                 assert!(m == AuthAllowed::Anonymous);
                             }
                             _ => {
-                                error!("A critical error has occured! We have a non-continue result!");
+                                error!(
+                                    "A critical error has occured! We have a non-continue result!"
+                                );
                                 panic!();
                             }
                         };
@@ -242,13 +244,18 @@ mod tests {
 
                 match r2 {
                     Ok(ar) => {
-                        let AuthResult { sessionid: _, state } = ar;
+                        let AuthResult {
+                            sessionid: _,
+                            state,
+                        } = ar;
                         match state {
                             AuthState::Success(_uat) => {
                                 // Check the uat.
                             }
                             _ => {
-                                error!("A critical error has occured! We have a non-succcess result!");
+                                error!(
+                                    "A critical error has occured! We have a non-succcess result!"
+                                );
                                 panic!();
                             }
                         }
diff --git a/src/server/main.rs b/src/server/main.rs
index 849c7c058..b30210d0f 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -9,7 +9,9 @@ extern crate structopt;
 extern crate log;
 
 use rsidm::config::Configuration;
-use rsidm::core::{backup_server_core, create_server_core, restore_server_core, verify_server_core};
+use rsidm::core::{
+    backup_server_core, create_server_core, restore_server_core, verify_server_core,
+};
 
 use std::path::PathBuf;
 use structopt::StructOpt;