Amendments to output formatting