Better formatting of dictionary