PEP8 refactor