diff --git a/base/src/functions/engineering/complex.rs b/base/src/functions/engineering/complex.rs
index a291294..2ec6015 100644
--- a/base/src/functions/engineering/complex.rs
+++ b/base/src/functions/engineering/complex.rs
@@ -188,10 +188,7 @@ impl Model {
         node: &Node,
         cell: CellReferenceIndex,
     ) -> Result<(f64, f64, Suffix), CalcResult> {
-        let value = match self.get_string(node, cell) {
-            Ok(s) => s,
-            Err(s) => return Err(s),
-        };
+        let value = self.get_string(node, cell)?;
         if value.is_empty() {
             return Ok((0.0, 0.0, Suffix::I));
         }
diff --git a/base/src/functions/financial.rs b/base/src/functions/financial.rs
index 023212d..50f2fb9 100644
--- a/base/src/functions/financial.rs
+++ b/base/src/functions/financial.rs
@@ -14,14 +14,8 @@ use super::financial_util::{compute_irr, compute_npv, compute_rate, compute_xirr
 // https://github.com/apache/openoffice/blob/c014b5f2b55cff8d4b0c952d5c16d62ecde09ca1/main/scaddins/source/analysis/financial.cxx
 
 fn is_less_than_one_year(start_date: i64, end_date: i64) -> Result<bool, String> {
-    let end = match from_excel_date(end_date) {
-        Ok(s) => s,
-        Err(s) => return Err(s),
-    };
-    let start = match from_excel_date(start_date) {
-        Ok(s) => s,
-        Err(s) => return Err(s),
-    };
+    let end = from_excel_date(end_date)?;
+    let start = from_excel_date(start_date)?;
     if end_date - start_date < 365 {
         return Ok(true);
     }
diff --git a/base/src/model.rs b/base/src/model.rs
index 8f228d1..58aa59b 100644
--- a/base/src/model.rs
+++ b/base/src/model.rs
@@ -960,10 +960,7 @@ impl Model {
                 }
             }
         }
-        let sheet = match self.get_sheet_index_by_name(&sheet_name) {
-            Some(s) => s,
-            None => return None,
-        };
+        let sheet = self.get_sheet_index_by_name(&sheet_name)?;
         let row = match row.parse::<i32>() {
             Ok(r) => r,
             Err(_) => return None,