code cleanup and added support for the Name Servers