Changes to output formatting