Cleaned up the data path for nodes

Now don’t have to dereference the data pointer twice, node service was
overkill.