Refactored all Neo4j demo code