Refactoring/PEP8 vote