Snippet improvement