Form refactoring