Fixed sonar reported issues
Fixed sonar reported issues