switched to argparse for uniformity, some pep8 stuff