first sonar refactorings