A......... [ZBX-7781] code refactoring