Refactor the participant