Better formatting of tags