Fixed various flake8 errors
Merge pull request #83 from trobert2/test_refactor7

Fixed various flake8 errors