Refactoring/symplify remove _NodeFactory