Cleaned up output formatting.