Node internal refactor