New snippets and clean up.