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