Formatting cleanup
Better formatting of values