Refactor Node Paths
Refactor Cypher