Refactor *Point -> *Node