.......PS. [ZBX-8328] stylistic fixes during code review