Improve xyf snippets