- pep8 cleanup

(cherry picked from commit 6e53e866dea4eba630128e856573ca1076b91611)