more pep8 and style edits