Neo4j refactoring