adding validation to forms, clean up