refacto sonar