...G...PS. [ZBXNEXT-101] coding style fixes