FormBuilder refactor - Code cleanup