refactoring and small changes

Created by: maartyman

Merge request reports

Loading