Rework affiliations as commas need to be in them