PEP8 Cleanup

Change-Id: Id10ed5f90bc8035777d980993681114035ec0bab