pep8 fixes
pylint fixes
Merge branch 'lint-fixes' into develop