DNN-3820 - minor refactoring