more pep8 (should be all now)