[PEP8] remaining pep8 fixes

Change-Id: Ia6360fcec610cd7af413a24d779074f175663ed3
[PEP8] remaining pep8 changes

Change-Id: I24123d8ed01b938e072b372ef7ba77f678c1c354