Improve syntax highlight