A......... [ZBXNEXT-1133] minor code refactoring