Fix Sonar : refactor code