Refactor to use existing pluralize helper