pep8 and argparse cleanup.