make sonar compliant