Form class refactoring