..F....... [ZBX-8720] made a code more readable; minor code improvements