Fix flake/pep8 issues

Change-Id: If038ee6b106b7404d19266d1b0d591c6b3bdb1c9