diff --git a/game/main.cpp b/game/main.cpp
index 4271ec3976..5d4eb9d031 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -4,71 +4,69 @@
 #include <fstream>
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 
 #include "engine.hpp"
 
 using namespace std;
 
-void maintest (boost::filesystem::path dataDir, const std::string& cellName,
-    std::string master)
+/// Parse command line options and openmw.cfg file (if one exists). Results are directly
+/// written to \a engine.
+/// \return Run OpenMW?
+
+bool parseOptions (int argc, char**argv, OMW::Engine& engine)
 {
-    assert (!dataDir.empty());
-  
-    OMW::Engine engine;
-
-    engine.setDataDir (dataDir);
-
-    engine.setCell (cellName);
-
-    engine.addMaster (master);
-
-    engine.go();
-}
-
-int main(int argc, char**argv)
-{
-  try
-  {
     boost::program_options::options_description desc (
-      "Syntax: openmw <options>\nAllowed options");
+        "Syntax: openmw <options>\nAllowed options");
 
     desc.add_options()
-      ("help", "print help message")
-      ("data", boost::program_options::value<std::string>()->default_value ("data"),
-        "set data directory")
-      ("start", boost::program_options::value<std::string>()->default_value ("Beshara"),
-        "set initial cell (only interior cells supported at the moment")
-      ("master", boost::program_options::value<std::string>()->default_value ("Morrowind"),
-        "master file")
-      ;
+        ("help", "print help message")
+        ("data", boost::program_options::value<std::string>()->default_value ("data"),
+            "set data directory")
+        ("start", boost::program_options::value<std::string>()->default_value ("Beshara"),
+            "set initial cell (only interior cells supported at the moment")
+        ("master", boost::program_options::value<std::string>()->default_value ("Morrowind"),
+            "master file")
+        ;
   
     boost::program_options::variables_map variables;
     
     std::ifstream configFile ("openmw.cfg");
 
     boost::program_options::store (
-      boost::program_options::parse_command_line (argc, argv, desc), variables);
+        boost::program_options::parse_command_line (argc, argv, desc), variables);
     boost::program_options::notify (variables);
 
     if (configFile.is_open())
-      boost::program_options::store (
-        boost::program_options::parse_config_file (configFile, desc), variables);
+        boost::program_options::store (
+            boost::program_options::parse_config_file (configFile, desc), variables);
 
     if (variables.count ("help"))
     {
-      std::cout << desc << std::endl;
+        std::cout << desc << std::endl;
+        return false;
     }
-    else
-    {          
-      maintest (variables["data"].as<std::string>(), variables["start"].as<std::string>(),
-        variables["master"].as<std::string>());
-    }  
-  }
-  catch(exception &e)
-    {
-      cout << "\nERROR: " << e.what() << endl;
-      return 1;
-    }
-  return 0;
+
+    engine.setDataDir (variables["data"].as<std::string>());
+    engine.setCell (variables["start"].as<std::string>());
+    engine.addMaster (variables["master"].as<std::string>());
+}
+
+int main(int argc, char**argv)
+{
+    try
+    {
+        OMW::Engine engine;
+    
+        if (parseOptions (argc, argv, engine))
+        {
+            engine.go();
+        }
+    }
+    catch(exception &e)
+    {
+        cout << "\nERROR: " << e.what() << endl;
+        return 1;
+    }
+  
+    return 0;
 }