[DF-1899] code changes after review.