argparse arguments simplified and small changes