Forms refactoring