sonar cleanup & scannerfix