Improvements and simplifications on the snippets