Refactor membership.