SONAR-4305 change some logs and comments