Some text and pep8 changes