diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs
index 825b6de2ca..bb6f14bf7f 100644
--- a/server/src/rtsim/entity.rs
+++ b/server/src/rtsim/entity.rs
@@ -179,7 +179,7 @@ impl Entity {
             });
             self.brain.begin = begin_site_id;
 
-            if self.brain.track_computed == false {
+            if !self.brain.track_computed {
                 begin_site_id
                     .zip(tgt_site)
                     .map(|(begin_site_id, tgt_site)| {
@@ -202,10 +202,14 @@ impl Entity {
             }
 
             if self.brain.track_computed && self.brain.track.is_some() && tgt_site.is_some() {
-                let track_id = self.brain.track.unwrap(); // track checked above
+                let track_id = self
+                    .brain
+                    .track
+                    .expect("Track id is none after is_some check"); // track checked above
                 let track = &world.civs().tracks.get(track_id);
 
-                let site = &world.civs().sites[tgt_site.unwrap()]; // tgt_site checked above
+                let site =
+                    &world.civs().sites[tgt_site.expect("Target site is none after is_some check")]; // tgt_site checked above
                 let destination_name = site
                     .site_tmp
                     .map_or("".to_string(), |id| index.sites[id].name().to_string());
@@ -264,7 +268,8 @@ impl Entity {
         }
 
         if !next_pos_calculated && tgt_site.is_some() {
-            let site = &world.civs().sites[tgt_site.unwrap()];
+            let site =
+                &world.civs().sites[tgt_site.expect("Target site is None after is_some check")];
             let destination_name = site
                 .site_tmp
                 .map_or("".to_string(), |id| index.sites[id].name().to_string());
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index e1902d7728..50fa9e5089 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -912,11 +912,12 @@ impl<'a> AgentData<'a> {
                                                     .brain
                                                     .remembers_character(&tgt_stats.name)
                                                 {
-                                        format!(
-                                            "Greetings fair {}! It has been far too long since \
-                                             last I saw you. I'm going to {} right now.",
-                                            &tgt_stats.name, destination_name
-                                        )
+                                                    format!(
+                                                        "Greetings fair {}! It has been far too \
+                                                         long since last I saw you. I'm going to \
+                                                         {} right now.",
+                                                        &tgt_stats.name, destination_name
+                                                    )
                                                 } else {
                                                     format!(
                                                         "I'm heading to {}! Want to come along?",