fix(sonar): improve code quality

[oyo]

Description

Removed sonar findings

Why

We fix medium sonar findings to improve the overall code quality.

Issue

749

Checklist

• [x] I have followed the contributing guidelines
• [x] I have performed a self-review of my own code
• [x] I have successfully tested my changes locally

[sonarcloud[bot]]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud