improve highlighter