cleanup of names