Pep8 some lines.
Merge branch 'pep8fixes' into develop