[SUREFIRE] refactoring after Sonar report
13 files changed