Code cleanup
Removed hard coded pluralization