diff --git a/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs b/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs
index c99b322a12..8b63f353fb 100644
--- a/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs
+++ b/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs
@@ -21,10 +21,13 @@ use async_std::sync::{Arc, Mutex, RwLock};
 use async_trait::async_trait;
 use flume::{Receiver, Sender};
 use futures::select;
-use zenoh::internal::buffers::{SplitBuffer, ZBuf};
 use zenoh::{
     core::Result as ZResult,
-    internal::{bail, zenoh_home, Timed, TimedEvent, Timer},
+    internal::{
+        bail,
+        buffers::{SplitBuffer, ZBuf},
+        zenoh_home, Timed, TimedEvent, Timer,
+    },
     key_expr::{
         keyexpr_tree::{
             IKeyExprTree, IKeyExprTreeMut, KeBoxTree, KeyedSetProvider, NonWild, UnknownWildness,
diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
index ccbaba6402..82cd866433 100644
--- a/zenoh/src/lib.rs
+++ b/zenoh/src/lib.rs
@@ -126,8 +126,6 @@ pub mod prelude;
 
 /// Zenoh core types
 pub mod core {
-    /// Zenoh message priority
-    pub use crate::api::publisher::Priority;
     #[allow(deprecated)]
     pub use zenoh_core::{AsyncResolve, SyncResolve};
     pub use zenoh_core::{Resolvable, Resolve, Wait};
@@ -136,6 +134,9 @@ pub mod core {
     pub use zenoh_result::Error;
     /// A zenoh result.
     pub use zenoh_result::ZResult as Result;
+
+    /// Zenoh message priority
+    pub use crate::api::publisher::Priority;
 }
 
 /// [Key expression](https://github.com/eclipse-zenoh/roadmap/blob/main/rfcs/ALL/Key%20Expressions.md) are Zenoh's address space.
@@ -177,10 +178,9 @@ pub mod key_expr {
             IKeyExprTree, IKeyExprTreeMut, KeBoxTree,
         };
     }
-    pub use zenoh_keyexpr::{keyexpr, OwnedKeyExpr};
-
     #[zenoh_macros::unstable]
     pub use zenoh_keyexpr::SetIntersectionLevel;
+    pub use zenoh_keyexpr::{keyexpr, OwnedKeyExpr};
 
     pub use crate::api::key_expr::{KeyExpr, KeyExprUndeclaration};
     // keyexpr format macro support
@@ -299,13 +299,12 @@ pub mod query {
     pub use crate::api::query::ReplyKeyExpr;
     #[zenoh_macros::unstable]
     pub use crate::api::query::REPLY_KEY_EXPR_ANY_SEL_PARAM;
-    pub use crate::api::query::{ConsolidationMode, QueryConsolidation, QueryTarget, Reply};
-    pub use crate::api::queryable::Query;
     #[zenoh_macros::unstable]
     #[zenoh_macros::internal]
     pub use crate::api::queryable::ReplySample;
-    pub use crate::api::queryable::{
-        ReplyBuilder, ReplyBuilderDelete, ReplyBuilderPut, ReplyErrBuilder,
+    pub use crate::api::{
+        query::{ConsolidationMode, QueryConsolidation, QueryTarget, Reply},
+        queryable::{Query, ReplyBuilder, ReplyBuilderDelete, ReplyBuilderPut, ReplyErrBuilder},
     };
 }
 
@@ -324,9 +323,10 @@ pub mod handlers {
 
 /// Scouting primitives
 pub mod scouting {
-    pub use crate::api::scouting::{scout, Scout, ScoutBuilder};
     /// A zenoh Hello message.
     pub use zenoh_protocol::scouting::Hello;
+
+    pub use crate::api::scouting::{scout, Scout, ScoutBuilder};
 }
 
 /// Liveliness primitives
diff --git a/zenoh/src/net/routing/hat/mod.rs b/zenoh/src/net/routing/hat/mod.rs
index c34a4c58ca..3039c91348 100644
--- a/zenoh/src/net/routing/hat/mod.rs
+++ b/zenoh/src/net/routing/hat/mod.rs
@@ -22,8 +22,7 @@ use std::{any::Any, collections::HashMap, sync::Arc};
 use zenoh_buffers::ZBuf;
 use zenoh_config::{unwrap_or_default, Config, WhatAmI};
 use zenoh_protocol::{
-    core::WireExpr,
-    core::ZenohId,
+    core::{WireExpr, ZenohId},
     network::{
         declare::{
             queryable::ext::QueryableInfoType, subscriber::ext::SubscriberInfo, QueryableId,