[fix] fix of SONAR violations