..F....... [ZBXNEXT-2160] made minor code improvements; no functional changes