CatFighter class cleanup