form class refactoring
more form class cleaning