Refactor/cleanup party code a bit