Improve code hightliting