Moved highlight to separate method. Cursor refactor