turned function names slightly more pythonic