[CLEANUP] Clean code in FormEngine