Refactoring for Neo4jClient