flake8 fixes
Merge pull request #2210 from dnaeon/flake8-fixes

flake8 fixes