pep8 changes

Change-Id: If86c7613d3daeb0cbbafef5bad4e8a42633a7c2e