Some cosmetic changes for the output file