Move highlight method to Highlighter module