Simplify logic in Node operations