Clean-up and pep8
More cleaning-up and pep8
More cleaning-up and pep8
Even more clean-up and pep8
Flake8