cleanup
Added form validation