Improve formatting of output