Fix null pointer exception when removing a data set
Minor style updates
Better logging with host renaming