cypher query refactoring
cypher query engine complete