DRY up affiliations, indent