...G...PS. [ZBXNEXT-101] renamed functions for consistency and fixed code formatting