...G...... [ZBXNEXT-1506] style fixes