refactor: rewrite forms using form helper