diff --git a/src/autorouter/invoker.rs b/src/autorouter/invoker.rs
index 55d7654..1a218a5 100644
--- a/src/autorouter/invoker.rs
+++ b/src/autorouter/invoker.rs
@@ -202,6 +202,6 @@ impl<M: AccessMesadata> Invoker<M> {
             self.execute(entry.command().clone());
         }
 
-        self.history.set_undone(undone.into_iter());
+        self.history.set_undone(undone);
     }
 }
diff --git a/src/board/mod.rs b/src/board/mod.rs
index d6da0e9..665b837 100644
--- a/src/board/mod.rs
+++ b/src/board/mod.rs
@@ -239,15 +239,10 @@ impl<M: AccessMesadata> Board<M> {
 
     /// Finds a band between two pin names.
     pub fn band_between_pins(&self, pinname1: &str, pinname2: &str) -> Option<BandUid> {
-        if let Some(band) = self
-            .band_bandname
+        self.band_bandname
             // note: it doesn't matter in what order pinnames are given, the constructor sorts them
             .get_by_right(&BandName::new(pinname1.to_string(), pinname2.to_string()))
-        {
-            Some(*band)
-        } else {
-            None
-        }
+            .copied()
     }
 
     /// Returns the mesadata associated with the layout's drawing rules.
diff --git a/src/drawing/drawing.rs b/src/drawing/drawing.rs
index 96bbe54..97b5ff0 100644
--- a/src/drawing/drawing.rs
+++ b/src/drawing/drawing.rs
@@ -495,10 +495,9 @@ impl<CW: Copy, R: AccessRules> Drawing<CW, R> {
 
         if let Some(outer) = self.primitive(cane.bend).outer() {
             self.update_this_and_outward_bows(recorder, outer)
-                .map_err(|err| {
+                .inspect_err(|_| {
                     let joint = self.primitive(cane.bend).other_joint(cane.dot);
                     self.remove_cane(recorder, &cane, joint);
-                    err
                 })?;
         }
 
@@ -669,20 +668,18 @@ impl<CW: Copy, R: AccessRules> Drawing<CW, R> {
         let seg_to = self.add_dot_with_infringables(recorder, dot_weight, infringables)?;
         let seg = self
             .add_seg_with_infringables(recorder, from, seg_to.into(), seg_weight, infringables)
-            .map_err(|err| {
+            .inspect_err(|_| {
                 self.recording_geometry_with_rtree
                     .remove_dot(recorder, seg_to.into());
-                err
             })?;
 
         let to = self
             .add_dot_with_infringables(recorder, dot_weight, infringables)
-            .map_err(|err| {
+            .inspect_err(|_| {
                 self.recording_geometry_with_rtree
                     .remove_seg(recorder, seg.into());
                 self.recording_geometry_with_rtree
                     .remove_dot(recorder, seg_to.into());
-                err
             })?;
 
         let (bend_from, bend_to) = if cw { (to, seg_to) } else { (seg_to, to) };
@@ -696,14 +693,13 @@ impl<CW: Copy, R: AccessRules> Drawing<CW, R> {
                 bend_weight,
                 infringables,
             )
-            .map_err(|err| {
+            .inspect_err(|_| {
                 self.recording_geometry_with_rtree
                     .remove_dot(recorder, to.into());
                 self.recording_geometry_with_rtree
                     .remove_seg(recorder, seg.into());
                 self.recording_geometry_with_rtree
                     .remove_dot(recorder, seg_to.into());
-                err
             })?;
 
         Ok(Cane {
diff --git a/src/geometry/geometry.rs b/src/geometry/geometry.rs
index 95af85e..1876fc3 100644
--- a/src/geometry/geometry.rs
+++ b/src/geometry/geometry.rs
@@ -197,10 +197,8 @@ impl<
     }
 
     pub(super) fn add_compound_at_index(&mut self, compound: GenericIndex<CW>, weight: CW) {
-        self.graph.update_node(
-            compound.petgraph_index(),
-            GenericNode::Compound(weight.into()),
-        );
+        self.graph
+            .update_node(compound.petgraph_index(), GenericNode::Compound(weight));
     }
 
     fn init_bend_joints_and_core<W: AccessBendWeight<PW>>(
diff --git a/src/interactor/activity.rs b/src/interactor/activity.rs
index a29008c..63b5176 100644
--- a/src/interactor/activity.rs
+++ b/src/interactor/activity.rs
@@ -137,7 +137,7 @@ impl<M: AccessMesadata> Step<ActivityContext<'_, M>, String> for ActivityStepper
     ) -> Result<ControlFlow<String>, ActivityError> {
         let status = self.activity.step(context)?;
         self.maybe_status = Some(status.clone());
-        Ok(status.into())
+        Ok(status)
     }
 }
 
diff --git a/src/specctra/design.rs b/src/specctra/design.rs
index 3590392..ba0882b 100644
--- a/src/specctra/design.rs
+++ b/src/specctra/design.rs
@@ -206,10 +206,10 @@ impl SpecctraDesign {
                     .netname_net(&net_pin_assignments.name)
                     .unwrap();
 
-                net_pin_assignments.pins.as_ref().and_then(|pins| {
+                net_pin_assignments.pins.as_ref().map(|pins| {
                     // take the list of pins
                     // and for each pin output (pin name, net id)
-                    Some(pins.names.iter().map(move |pinname| (pinname.clone(), net)))
+                    pins.names.iter().map(move |pinname| (pinname.clone(), net))
                 })
             })
             // flatten the nested iters into a single stream of tuples