Optimize highlighting