diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs
index 7f5c2771..04267b58 100644
--- a/src/database/entities/channel.rs
+++ b/src/database/entities/channel.rs
@@ -1,8 +1,6 @@
+use crate::database::*;
+use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
-use crate::{
-    database::*,
-    notifications::{events::ClientboundNotification, hive},
-};
 use mongodb::bson::to_document;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/notifications/events.rs b/src/notifications/events.rs
index 4031d4e7..9056ce04 100644
--- a/src/notifications/events.rs
+++ b/src/notifications/events.rs
@@ -1,6 +1,6 @@
-use serde::{Deserialize, Serialize};
-use rauth::auth::Session;
 use hive_pubsub::PubSub;
+use rauth::auth::Session;
+use serde::{Deserialize, Serialize};
 use snafu::Snafu;
 
 use super::hive::{get_hive, subscribe_if_exists};
@@ -95,19 +95,17 @@ pub fn prehandle_hook(notification: &ClientboundNotification) {
                 .unsubscribe(&user.to_string(), &id.to_string())
                 .ok();
         }
-        ClientboundNotification::UserRelationship { id, user, status } => {
-            match status {
-                RelationshipStatus::None => {
-                    get_hive()
-                        .hive
-                        .unsubscribe(&id.to_string(), &user.to_string())
-                        .ok();
-                },
-                _ => {
-                    subscribe_if_exists(id.clone(), user.clone()).ok();
-                }
+        ClientboundNotification::UserRelationship { id, user, status } => match status {
+            RelationshipStatus::None => {
+                get_hive()
+                    .hive
+                    .unsubscribe(&id.to_string(), &user.to_string())
+                    .ok();
             }
-        }
+            _ => {
+                subscribe_if_exists(id.clone(), user.clone()).ok();
+            }
+        },
         _ => {}
     }
 }
diff --git a/src/routes/users/add_friend.rs b/src/routes/users/add_friend.rs
index 298dc922..f918fc8e 100644
--- a/src/routes/users/add_friend.rs
+++ b/src/routes/users/add_friend.rs
@@ -1,5 +1,5 @@
 use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
 
 use futures::try_join;
diff --git a/src/routes/users/block_user.rs b/src/routes/users/block_user.rs
index 9c069e5e..1fb51831 100644
--- a/src/routes/users/block_user.rs
+++ b/src/routes/users/block_user.rs
@@ -1,5 +1,5 @@
 use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
 
 use futures::try_join;
diff --git a/src/routes/users/remove_friend.rs b/src/routes/users/remove_friend.rs
index e68f20a4..37e831a1 100644
--- a/src/routes/users/remove_friend.rs
+++ b/src/routes/users/remove_friend.rs
@@ -1,9 +1,8 @@
 use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
 
 use futures::try_join;
-use hive_pubsub::PubSub;
 use mongodb::bson::doc;
 use rocket_contrib::json::JsonValue;
 
diff --git a/src/routes/users/unblock_user.rs b/src/routes/users/unblock_user.rs
index 0d238521..ec575c4b 100644
--- a/src/routes/users/unblock_user.rs
+++ b/src/routes/users/unblock_user.rs
@@ -1,9 +1,8 @@
 use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
 
 use futures::try_join;
-use hive_pubsub::PubSub;
 use mongodb::bson::doc;
 use rocket_contrib::json::JsonValue;