resolving sonar issues