Add highlight of comments in class case [untested]