all passing
cleanup, pep8