[DF-2961] Code changes after review.