Clean up find_highlight method.