Some refactoring + improvements

Merge request reports

Loading