Cleaning: Fixed some issues found by SonarQube