Cleaner logic
Bump version. Use latest version of lodash.