Refactored code
Some argparse improvements