Add Badges
Simplify snippets