........S. [ZBX-8414] minor code improvements