A......... [ZBXNEXT-1583] minor coding style fixes