Adding new comments and pep8 cleanups