pep8 fixes

Change-Id: I8cdff72bbb19a555ec2a7a22d2db8bb3b98752a1