Resolve pep8 comments

Now all files pass the pep8 tests with hacking enabled.

Change-Id: If804f1727464cea74ae48de1275470d69587efdb