A......... [ZBX-6596] minor code refactoring