completed forms refactoring