Code quality

Correcting Sonar warnings