refactoring, first batch

Merge request reports

Loading