.......PS. [ZBXNEXT-2260] minor code improvements