Improve classes snippets