Minor changes to output format