PEP8 fixes

Change-Id: Ifc2e0abf57308758702bce409935ac1f9ff88185