Improve code highlighting