Section FormType refactoring