Refactor _.map to simplify variable assignments
Merge pull request #1773 from danielstreit/master

Refactor _.map to simplify variable assignments