BS-11338 : Sonar : Reduce complexity

- After last analyse Sonar, one complexity is introduced. Reduce it.