Fix pep8 issues

This pull request fixes (all the) 2516 pep8 issues.