Slimmed down the argparse commands