[DF-4879] - Code Review, comments for changes added.