Regrouped argparse options for a better help screen, minor PEP8 fixins