Fix flake8 error for line being too long
Various pep8 fixes and cleanups

Re #36