Code review changes

fix sonarQube code smells

Merge request reports

Loading