Renamed functions to be pythonic