CHAT-1 fix some sonar violations