Reduce code, use more of the existing variables and lodash sugar.

Reduce code, use more of the existing variables and lodash sugar.