diff --git a/common/src/states/basic_summon.rs b/common/src/states/basic_summon.rs
index d47f555bb4..35aed55e29 100644
--- a/common/src/states/basic_summon.rs
+++ b/common/src/states/basic_summon.rs
@@ -194,7 +194,7 @@ impl CharacterBehavior for Data {
                                 rng.gen_range(-1.0..=1.0),
                                 0.0,
                             ))
-                            .map(|dir| comp::Ori::from(dir))
+                            .map(comp::Ori::from)
                             .unwrap_or_default(),
                             npc: NpcBuilder::new(stats, body, comp::Alignment::Owned(*data.uid))
                                 .with_skill_set(skill_set)
diff --git a/rtsim/src/data/npc.rs b/rtsim/src/data/npc.rs
index 16d2e2a48e..eaa7e8aa50 100644
--- a/rtsim/src/data/npc.rs
+++ b/rtsim/src/data/npc.rs
@@ -307,11 +307,10 @@ impl NpcLinks {
         if let Some(riders) = self.mount_map.get_mut(link.mount) {
             if link.is_steering && riders.steerer == Some(id) {
                 riders.steerer = None;
-            } else {
-                if let Some((i, _)) = riders.riders.iter().enumerate().find(|(_, i)| **i == id) {
-                    riders.riders.remove(i);
-                }
+            } else if let Some((i, _)) = riders.riders.iter().enumerate().find(|(_, i)| **i == id) {
+                riders.riders.remove(i);
             }
+            
             if riders.steerer.is_none() && riders.riders.is_empty() {
                 self.mount_map.remove(link.mount);
             }
@@ -457,8 +456,8 @@ impl From<HopSlotMap<MountId, NpcLink>> for NpcLinks {
     }
 }
 
-impl Into<HopSlotMap<MountId, NpcLink>> for NpcLinks {
-    fn into(self) -> HopSlotMap<MountId, NpcLink> { self.links }
+impl From<NpcLinks> for HopSlotMap<MountId, NpcLink> {
+    fn from(other: NpcLinks) -> Self { other.links }
 }
 slotmap::new_key_type! {
     pub struct MountId;
diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs
index 8d7cfa2262..9a01615767 100644
--- a/server/src/state_ext.rs
+++ b/server/src/state_ext.rs
@@ -790,7 +790,7 @@ impl StateExt for State {
                         rng.gen_range(-1.0..=1.0),
                         0.0,
                     ))
-                    .map(|dir| comp::Ori::from(dir))
+                    .map(comp::Ori::from)
                     .unwrap_or_default();
                     let pet_entity = self
                         .create_npc(
diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs
index 9a2377e359..abdab100d6 100644
--- a/server/src/sys/terrain.rs
+++ b/server/src/sys/terrain.rs
@@ -218,7 +218,7 @@ impl<'a> System<'a> for Sys {
                                 rng.gen_range(-1.0..=1.0),
                                 0.0,
                             ))
-                            .map(|dir| comp::Ori::from(dir))
+                            .map(comp::Ori::from)
                             .unwrap_or_default(),
                             npc: NpcBuilder::new(stats, body, alignment)
                                 .with_skill_set(skill_set)