Improve sample snippets