even more pep8 happiness