Further refactoring and general improvements

Merge request reports

Loading