PEP8 fixes thanks to http://pep8.me