Renamed private methods to take advantage of closure