comments and pep8 cleaning