refactoring for more "form option" completion