Sonar suggestions

Many changes following the code quality recommendations from Sonar.

See merge request !8