Improve snippets