[fix] fix of some sonar violations