Refactoring Form classes
Carry on working on Form class