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