Form refactoring (2)