More pep8-ifying