clean up names