Pep8ify + cosmetics