[TASK] Clean up adding children to the Form object