Improved code highlightning