adding some PEP8 compliance
Almost repaired arguments parsing