Improved output Formatting