remove _.isFunction check
include underscore isObject
replace double- with single-quotes for consistency