Improve output format