Form refactoring (1)