Moved argument parsing into CommandLineArguments