[DF-2897] Code changes after review.