Fixed the Sonar technical debt.