cleanup pluralization