Neo4j code improvement.