[task] solving sonar violations