Code refactoring
Add badges