Refactor _.map, simplified variable assignments