Fix pep8 violations.
Merge remote-tracking branch 'ivan-github/bug/pep-8-fixes' into develop