more pep8 love, with more to come