Refactoring

Remove untMainForm dependency