........S. [ZBX-7621] stylistic changes