flake8 spacing error
isort fixes
Merge branch 'feature/flake8' into develop