Form refactor (1.5)