Add status badge
Refactoring