Enhance output formating