Update metadata formatting a little more