Changed function names to be more pythonic