cleaning up mixup