improved snippets in vim