[minor] Minor refactor