refactor forms continue