[refactor] Minor code reduction