[fix] fix or some SONAR violations