Updated the output formatting