Have fixed some stuff from SonarQube
Have fixed some stuff from SonarQube
Have fixed some stuff from SonarQube