Large amount of cleanups for "Sonar" code style/quality checks