...G...PS. [ZBXNEXT-101] stylistic suggestions during code review: mostly reverted unnecessary changes