pep8 fixes

Change-Id: Ida8b6b45dc63c49cf1f1e494cf54f427f48e854a