Snippet cleanup