Refactor party set into separate class