[#70499202] Improves the formatting