code clean to match zabbix complete