Modified the output formatting