DNN-3725 minor code changes based on Francesco's comments. NO functionality was changed, just code clean-up