..F....... [ZBXNEXT-2107] code refactoring