Cosmetic modifications for pep8 compliance