Replacing with lodash in a few places #21