Renamed a few functions to start with an underscore