.......PS. [ZBX-8476] minor code improvements