Shaped up the tags a bit