Fix Code smell issues and formatting

Merge request reports

Loading