Form refactorings
Form refactorings