Refactor getters declaration