added some name stripping values