more pep8/257 fixes