..F....... [ZBX-8349] minor refactoring