A......... [ZBX-8364] minor code improvements