[cleanup] fixed Sonar violations