[style] changes to make the new, more aggressive pep8 happy