cleaned names up