Simplify/fix argparse config
Modernize code