refactor FormBuilder
clean up imports