Keep in alphabetical order & remove type from snippets