Refactor party creation