improve quality thanks to SONAR
improve code quality
Improve quality