pep8 fixes

Change-Id: I12d3fd0ff9a678b2bd8f3d5811532bf3f3c1fcd2