More refactoring symplifiying node creation