Pep8 fixes.
Merge branch 'pep8fix' into develop