refactor: clean up form binding & validation (#38873)