updated output formatting

If you like the new layout, then feel free to merge.