Fix Minor and Info errors SonarQube