[artf712166]:::Fixing sonar Violations.