Fix issues and code smells detected by Sonarqube - phase 2

Copyright © Eclipse Foundation AISBL. All rights reserved.     Privacy Policy | Terms of Use | Copyright Agent