Cleaned up output formatting