[PEP8] remaining pep8 fixes

Change-Id: I5ae9b7e0f268ea755f0addf6231d0f548cc8d7db