Refactored a bit

Merge request reports

Loading