Form refactoring complete