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