DF-3968 code style according to review