Changed to argparse argument handling