Draft: Refactor to address sonar issues

Solomon Ayalewrequested to merge
solxget/sonar into master

Address Cognitive and Cyclomatic complexity to bring the project to the acceptable threshold

Edited by Solomon Ayalew

Merge request reports