pep8 changes

Change-Id: I762c8abaeffafc4cde4acdf8a623d36a960b7327