Refactor to indicate proper encapsulation