more pep8'ing