Cleaned SonarQube-detected issues