DNN-3821 - minor refactoring