Form refactorings