diff --git a/src/merkle/partial_mt/mod.rs b/src/merkle/partial_mt/mod.rs
index 1f9e2d5..ef46432 100644
--- a/src/merkle/partial_mt/mod.rs
+++ b/src/merkle/partial_mt/mod.rs
@@ -214,7 +214,7 @@ impl PartialMerkleTree {
     /// # Errors
     /// Returns an error if:
     /// - the specified index has depth set to 0 or the depth is greater than the depth of this
-    /// Merkle tree.
+    ///   Merkle tree.
     /// - the specified index is not contained in the nodes map.
     pub fn get_path(&self, mut index: NodeIndex) -> Result<MerklePath, MerkleError> {
         if index.is_root() {
diff --git a/src/utils/kv_map.rs b/src/utils/kv_map.rs
index e68c26c..c9e6cf0 100644
--- a/src/utils/kv_map.rs
+++ b/src/utils/kv_map.rs
@@ -126,11 +126,10 @@ impl<K: Ord + Clone, V: Clone> KvMap<K, V> for RecordingMap<K, V> {
     ///
     /// If the key is part of the initial data set, the key access is recorded.
     fn get(&self, key: &K) -> Option<&V> {
-        self.data.get(key).map(|value| {
+        self.data.get(key).inspect(|&value| {
             if !self.updates.contains(key) {
                 self.trace.borrow_mut().insert(key.clone(), value.clone());
             }
-            value
         })
     }
 
@@ -155,11 +154,10 @@ impl<K: Ord + Clone, V: Clone> KvMap<K, V> for RecordingMap<K, V> {
     /// returned.
     fn insert(&mut self, key: K, value: V) -> Option<V> {
         let new_update = self.updates.insert(key.clone());
-        self.data.insert(key.clone(), value).map(|old_value| {
+        self.data.insert(key.clone(), value).inspect(|old_value| {
             if new_update {
                 self.trace.borrow_mut().insert(key, old_value.clone());
             }
-            old_value
         })
     }
 
@@ -167,12 +165,11 @@ impl<K: Ord + Clone, V: Clone> KvMap<K, V> for RecordingMap<K, V> {
     ///
     /// If the key exists in the data set, the old value is returned.
     fn remove(&mut self, key: &K) -> Option<V> {
-        self.data.remove(key).map(|old_value| {
+        self.data.remove(key).inspect(|old_value| {
             let new_update = self.updates.insert(key.clone());
             if new_update {
                 self.trace.borrow_mut().insert(key.clone(), old_value.clone());
             }
-            old_value
         })
     }