Improve syntax highlighting