Draft: fix: fix sonar reported issues

Manish Jangidrequested to merge
fix_sonar_reported_issues into master

Fix Issues reported by Sonar

Edited by Manish Jangid

Merge request reports