Refactored some code

Merge request reports

Loading