changed CleanName function