Form refactoring (1.2)