Added badges
Corrected return value
Removed unnecessary things