Change underscore to lodash, code reformation