syntax cleanup
argparse cleanup