.......PS. [ZBXNEXT-2160] suggested stylistic improvements during code review