update badges
clean up some smell