argparse + minor modification