added some string sanitation