clean up tags a bit