more pluralization clean up