[Sonar] Trailing comments + updated content to indicate it looks not nice.