diff --git a/src/main.rs b/src/main.rs
index 0dbdecb..5674ebf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -101,17 +101,17 @@ fn get_initial_model(file_path: &Option<PathBuf>) -> Result<Model> {
         }
     } else {
         Ok(Model::new("New Model"))
-    }
+    };
 }
 
 fn main() -> Result<()> {
     let args: Vec<String> = std::env::args().collect();
-    let maybe_cmd_line_args = parse_args(args);
 
-    if maybe_cmd_line_args.is_none() {
+    let cmd_line_args = if let Some(args) = parse_args(args) {
+        args
+    } else {
         return Ok(());
-    }
-    let cmd_line_args = maybe_cmd_line_args.unwrap();
+    };
 
     // Load or create model
     let mut model = get_initial_model(&cmd_line_args.file_path)?;