Scoped some of the comment snippets