final edits and a little pep8