minor form builder cleanup