Resolved below sonar issues: