I'll keep the class, it's simpler to spot.