Renamed all functions to remove _unneeded _underscore