PEP8 and small refactor.