Improved number highlighting