Improve function highlight