diff --git a/src/acquirable.rs b/src/acquirable.rs
index f245b7b..3d50168 100644
--- a/src/acquirable.rs
+++ b/src/acquirable.rs
@@ -9,7 +9,7 @@ use alloc::vec::Vec;
 use crate::{
     id::LockId,
     level::IsLevel,
-    mutex::{guard::MutexGuard, Mutex},
+    mutex::{Mutex, guard::MutexGuard},
     raw_mutex::RawMutex,
 };
 
diff --git a/src/acquirable/tuples.rs b/src/acquirable/tuples.rs
index fc9a876..9d34ae9 100644
--- a/src/acquirable/tuples.rs
+++ b/src/acquirable/tuples.rs
@@ -8,7 +8,7 @@
 use crate::{
     acquirable::Acquirable,
     level::{IsLevel, MaxLevel, MinLevel},
-    mutex::{guard::MutexGuard, Mutex},
+    mutex::{Mutex, guard::MutexGuard},
     raw_mutex::RawMutex,
 };
 
diff --git a/src/key.rs b/src/key.rs
index 79643be..7384690 100644
--- a/src/key.rs
+++ b/src/key.rs
@@ -10,10 +10,13 @@ use core::marker::PhantomData;
 
 use crate::{
     acquirable::Acquirable,
-    level::{Bottom, IsLevel, LockAfter},
+    level::{IsLevel, LockAfter},
     set::LockSet,
 };
 
+#[cfg(feature = "std")]
+use crate::level::Bottom;
+
 /// Scope token for ordered lock acquisition.
 ///
 /// Tracks the current lock level as a type parameter `Lvl`. Consumed
diff --git a/src/locksmith.rs b/src/locksmith.rs
index eaf6bd5..9b12c62 100644
--- a/src/locksmith.rs
+++ b/src/locksmith.rs
@@ -133,11 +133,7 @@ impl Locksmith {
             Some(limit) => self
                 .issued
                 .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
-                    if n < limit {
-                        Some(n + 1)
-                    } else {
-                        None
-                    }
+                    if n < limit { Some(n + 1) } else { None }
                 })
                 .ok()
                 .map(|_| KeyVoucher::new_internal()),
diff --git a/src/mutex.rs b/src/mutex.rs
index b73fe13..ee4ad32 100644
--- a/src/mutex.rs
+++ b/src/mutex.rs
@@ -20,11 +20,10 @@ pub mod guard;
 
 use core::{cell::UnsafeCell, fmt, marker::PhantomData};
 
-use crate::{
-    id::LockId,
-    level::{Base, IsLevel},
-    raw_mutex::RawMutex,
-};
+use crate::{id::LockId, level::IsLevel, raw_mutex::RawMutex};
+
+#[cfg(feature = "std")]
+use crate::level::Base;
 
 #[cfg(feature = "escape-hatch")]
 use guard::MutexGuard;
@@ -82,7 +81,7 @@ pub struct Mutex<T, Lvl: IsLevel = Base, R: RawMutex = crate::raw_mutex::std_mut
 /// let counter: M<u32> = Mutex::new(0);
 /// ```
 #[cfg(not(feature = "std"))]
-pub struct Mutex<T, Lvl: IsLevel = Base, R: RawMutex> {
+pub struct Mutex<T, Lvl: IsLevel, R: RawMutex> {
     id: LockId,
     pub(crate) raw: R,
     pub(crate) data: UnsafeCell<T>,
diff --git a/src/raw_mutex/lock_api_adapter.rs b/src/raw_mutex/lock_api_adapter.rs
index 095472e..6b03c3a 100644
--- a/src/raw_mutex/lock_api_adapter.rs
+++ b/src/raw_mutex/lock_api_adapter.rs
@@ -1,5 +1,5 @@
 #![allow(unsafe_code)]
-//! Blanket [`RawMutex`](super::RawMutex) impl for [`lock_api::RawMutex`].
+//! Blanket [`RawMutex`] impl for `lock_api::RawMutex`.
 //!
 //! This module is available behind the `lock-api` feature and bridges
 //! any `lock_api::RawMutex` implementation (`parking_lot`, `spin`, etc.)