Small fix to command line arg parsing
Converting command line argument parsing to use the built in argparse module
Minor cleanup