Collab edits

pep8 and minor edits