pep8 changes

Change-Id: I3aad0b30c05aa808f36ace84591440ce6c2ac35d