Improve Code Highlighting