Add party size | code cleanup