Node refactor