Improving a little bit the snippets