..F....... [ZBXNEXT-734] minor code refactoring