SONAR-4346 Minor style improvement