moving some form logic to template
cleanup