Refactor of within and bb for use with Neo4J