Cleaned up the command line options