Pass pep8 tests

Change-Id: I5ee47e5c1366ae570a72451e5c18ee7f66d2b274