[evol] code cleanup
[evol] code cleanup, and allowed pluralized version of object name in 'list' command