diff --git a/src/client_server/alias.rs b/src/client_server/alias.rs
index 848b935..a029388 100644
--- a/src/client_server/alias.rs
+++ b/src/client_server/alias.rs
@@ -1,9 +1,12 @@
 use super::State;
-use crate::{ConduitResult, Database, Error, Ruma, server_server};
-use ruma::api::{federation, client::{
-    error::ErrorKind,
-    r0::alias::{create_alias, delete_alias, get_alias},
-}};
+use crate::{server_server, ConduitResult, Database, Error, Ruma};
+use ruma::api::{
+    client::{
+        error::ErrorKind,
+        r0::alias::{create_alias, delete_alias, get_alias},
+    },
+    federation,
+};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, put};
diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index 4e670ec..e744ef9 100644
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@@ -81,10 +81,7 @@ pub async fn sync_events_route(
         let mut send_member_count = false;
         let mut joined_since_last_sync = false;
         let mut send_notification_counts = false;
-        for pdu in db
-            .rooms
-            .pdus_since(&sender_id, &room_id, since)?
-        {
+        for pdu in db.rooms.pdus_since(&sender_id, &room_id, since)? {
             let pdu = pdu?;
             send_notification_counts = true;
             if pdu.kind == EventType::RoomMember {
@@ -392,10 +389,7 @@ pub async fn sync_events_route(
     for room_id in db.rooms.rooms_invited(&sender_id) {
         let room_id = room_id?;
         let mut invited_since_last_sync = false;
-        for pdu in db
-            .rooms
-            .pdus_since(&sender_id, &room_id, since)?
-        {
+        for pdu in db.rooms.pdus_since(&sender_id, &room_id, since)? {
             let pdu = pdu?;
             if pdu.kind == EventType::RoomMember {
                 if pdu.state_key == Some(sender_id.to_string()) {
diff --git a/src/lib.rs b/src/lib.rs
index f761413..eea32c7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,10 @@
 pub mod client_server;
-pub mod server_server;
 mod database;
 mod error;
 mod pdu;
 mod push_rules;
 mod ruma_wrapper;
+pub mod server_server;
 mod utils;
 
 pub use database::Database;
diff --git a/src/main.rs b/src/main.rs
index ab9f544..d3a673f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,12 @@
 #![warn(rust_2018_idioms)]
 
-pub mod server_server;
 pub mod client_server;
+pub mod server_server;
 
-mod push_rules;
 mod database;
 mod error;
 mod pdu;
+mod push_rules;
 mod ruma_wrapper;
 mod utils;