more pep8 love

Just a bit more pep8 janitorial work for the new changes.