........S. [ZBXNEXT-2519] code refactoring