[DF-2431] - Code Review, style is changed according to Code Convention.