Getter refactor