FormBuilder refactor - code cleanup