Task #541 Refactoring of DHCP server code