clean up form validation