Did some more output formatting