Improve output formatting