..F....... [ZBX-7839] minor code improvements and style corrections