Improve highlight
Improve variable function wrapping