Using updated nfd.conf and client.conf + clean up of code