cleanup & add underscore.string to dependencies