More cleaning up of the output file