...G...... [ZBX-8545] code fixes and style adjustments