Fix pep8 errors in develop branch

Fix various pep8 errors introduced by recent commits.