Improved formatting of output