PEP8 refactoring, typos fixing