Form refactor