PEP8 refactoring, bug #98