pep8, plus a couple comments