Correct some pyflakes/pep8 problems

The next commit will make jenkins test for all .py files for pyflakes/pep8
problems. Correct them first so jenkins won't fail in it's commit.

Change-Id: I6eff6eccf3ca3b6c2bf62ab3b392a9207e7e7023