more restructure on validation types, remove redundant fields
more restructuring of validation