refactor neo4j