pep8 cleanup

Change-Id: Ib65d1e15aea890b64b33ef0fc76c74d8c6a39b25