Update Of Sonar Code

Easier to read and proper DEBUG configuration.