Move form definition to a separate file