Some code refactor/cleanup

Merge request reports

Loading