[#46235715] Cleanup and prettification for display.