Refactored out plurals