SONAR-5007 Apply some feedback