more pep8 stuff and fix comments