...G...... [ZBXNEXT-1300] coding style fixes