Refactoring
Refactoring for snippets and templates