refactory: party validation redesign