Whitespace changes, use lodash