........S. [ZBXNEXT-1133] minor code improvements and simplifying