Fix flake8 failures from pull/27

Fix a few formatting issues from within the
previous pull request.

Change-Id: Iadb0d5d4bfa1ac460c730e8af0cfec9386a4c066