Added argparse for more structured scripts