Refactor to use private accessors.