.......PS. [ZBXNEXT-2321] suggested stylistic and warning fixes