diff --git a/src/components/health.rs b/src/components/health.rs
index 61c325f..919ce35 100644
--- a/src/components/health.rs
+++ b/src/components/health.rs
@@ -52,18 +52,16 @@ impl Health {
     }
 
     pub fn peers_as_string(&self) -> String {
-        if self.peers.is_some() {
-            self.peers.unwrap().to_string()
-        } else {
-            DotSpinner::default().to_string()
+        match self.peers {
+            Some(peers) => peers.to_string(),
+            None => DotSpinner::default().to_string(),
         }
     }
 
     pub fn name_as_string(&self) -> String {
-        if self.name.is_some() {
-            self.name.clone().unwrap()
-        } else {
-            OghamCenter::default().to_string()
+        match self.name {
+            Some(name) => name.clone(),
+            None => OghamCenter::default().to_string(),
         }
     }
 }
diff --git a/src/network/predefined_calls.rs b/src/network/predefined_calls.rs
index e90d1aa..c9fd25c 100644
--- a/src/network/predefined_calls.rs
+++ b/src/network/predefined_calls.rs
@@ -283,7 +283,7 @@ pub async fn get_validator_staking_results(
 ) -> Result<()> {
     let (start, end) = super::raw_calls::historical::stored_range(api, None)
         .await?
-        .map(|range| (range.0 / 6, range.1 / 6))
+        .map(|range| (range.0.saturating_div(6), range.1.saturating_div(6)))
         .unwrap_or((0, 0));
     for era_index in start..end.saturating_sub(2) {
         get_validator_staking_result(action_tx, api, account_id, era_index).await?;