.......... [ZBX-8816] minor code refactoring