cleanup keys, add lodash