Clean up badge markup