..F....... [ZBX-8573] minor code re-factoring