Hints cleanup
Improved performance of current token highlight