Better formatting for output files