Minor PEP8 refactoring