diff --git a/run_fci.ml b/run_fci.ml
index 500ce3f..ce852cb 100644
--- a/run_fci.ml
+++ b/run_fci.ml
@@ -23,17 +23,9 @@ let () =
   end;
 
   (* Handle options *)
-  let basis_file  = 
-    match Command_line.get "basis" with
-    | Some x -> x
-    | None -> assert false
-  in
+  let basis_file  = Util.of_some Command_line.get "basis" in
 
-  let nuclei_file = 
-    match Command_line.get "xyz" with
-    | Some x -> x
-    | None -> assert false
-  in
+  let nuclei_file = Util.of_some Command_line.get "xyz" in
 
   let charge = 
     match Command_line.get "charge" with
diff --git a/run_hartree_fock.ml b/run_hartree_fock.ml
index 7f8fe77..499fb50 100644
--- a/run_hartree_fock.ml
+++ b/run_hartree_fock.ml
@@ -23,17 +23,9 @@ let () =
   end;
 
   (* Handle options *)
-  let basis_file  = 
-    match Command_line.get "basis" with
-    | Some x -> x
-    | None -> assert false
-  in
+  let basis_file  = Util.of_some Command_line.get "basis" in
 
-  let nuclei_file = 
-    match Command_line.get "xyz" with
-    | Some x -> x
-    | None -> assert false
-  in
+  let nuclei_file = Util.of_some Command_line.get "xyz" in
 
   let charge = 
     match Command_line.get "charge" with