chore(BPAAS-2122): Review SonarCloud complexities

[tngdomingo]

Description of Changes

Different small refactors based on SonarCloud reviews

Testing Procedure

• [] I have added new unit tests
• [X] All tests pass locally
• [X] I have tested manually in my local environment

Checklist:

• [X] I have performed a self-review of my own code
• [ ] I have made corresponding changes to the documentation
• [ ] I have updated CHANGELOG.md with my changes

[sonarqubecloud[bot]]

Quality Gate failed

Failed conditions
75.9% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud