Work towards better pep8 compliance as measured using [flake8](http://flake8.pycqa.org/en/latest/index.html)
