neo4j - refactoring