re-factoring for neo4j