Improve set snippets