[#65434852] refactoring form