Style fix: use _.map instead of _.each