A.F....... [ZBXNEXT-756] made minor code improvements; formatting