Sonar warnings cleanup