Do some refactoring using SonarQube