Comment snippets improvement