pep8 fixes and include comments