Improve formatting

[#52140727]