Better formatting of output with the format files