PEP8 fixes
Argument parsing improvements