refactoring yasnippets