Refactor invites