Fix some low-hanging fruit SonarCloud issues

Summary

Note that these are (on purpose) simple fixes. They are not full refactors of the functions; just minor improvements

Additional Required Actions

• Requires manual tests in pre-production: NO
• Requires a documentation update: NO

References

Closes #982 (closed)