Slight cleanup to exploding cards