Reduce code, use more of the existing variables and lodash sugar.
Merge pull request #3 from borisdiakur/cleanup

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