Refactor _.map to simplify variable assignments

As per jdalton's suggestion, simplified the variable assignments for _.map