More pep8 / flake8 fixes

correct more pep8 errors.