Code cleanup
Optimization of ClearHighlight