Refactor code; use factories for parties and party members