lodash, linted, minor changes