ruff

Refactor with statement formatting to have explicit layouts

#10296

Merged