Cleaned up the command line parsing of this file.