Improve snippet mode