Refactor party part 2