.......PS. [ZBXNEXT-2160] stylistic suggestions and typo fixes during code review