Clean up and add new badge