Snippet Refactor