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