...G...... [ZBX-8213] style corrections