Revert "Revert "code clean to match zabbix complete""

This reverts commit fa78a31540e03e7f51171f9c79a93c1d0161ec65.