DHCP: more cosmetics