Refactor to address sonar issues

Merge request reports

Loading