Small updates to clean output files