Cleanup and added NBTUtility