[#40783] Improve formatting