Cleanup / reduce SonarQube violations