refactoring CypherHighlighter