forms refactor