refactored highlighter