Node refactoring