SONAR-4569 Add some comments in code