clean up of names