Renamed some private methods