Cosmetics and pep8-ifying