Fix code quality problems reported by Sonar.
6 files changed