Fix pep8 warnings

Change-Id: Icd648746ea0296bbb5f89042b1c0ae8b80d3a515