Some reformatting and a new tag