Refactoring
Updated badges