........S. [ZBXNEXT-2471] minor code improvements