A......... [ZBX-8568] Improve code readability and fix code style.