...G...... [ZBX-8213] renamed variable; minor code improvements