.form.inc refactored