Refactored CypherCompiler