Fixes pluralization, more refactoring