some refactoring in GoTerm node