A......... [ZBXNEXT-1583] Improve code readability, fix code style, fix comments.