pep8 changes

Change-Id: I66345dbcab45a26bc5aabecefb0edc133e579ab2