Fix Sonar violations + cleanup