full pep8 compliance (part 2)

final step to pep8 compliance

Change-Id: Ibe44f55f9415dc8cc380521debee609a20a67416
Merge "full pep8 compliance (part 2)"