Minor improvement according to Sonar.