Fixing Sonar errors
7 files changed