pep8 fixes

Change-Id: I27bbfa1542864bd6194352945add00cdecccfcc5