Node refactors