form2 internal refactoring