Removed some Sonar warnings
Removed some Sonar warnings