.......PS. [ZBX-7534] code improvements