.......... [ZBXNEXT-282] minor code and style corrections