Cleaning up output formatting... again.