SonarQube: improving code readability (II)