Sonar issues clean-up