SONAR-4421 Improve comment design