cleanup
pluralaization