Minor edits to conform to pep8 (mostly)