Refactor for clarity

Closes #3504781

Merge request reports

Loading