Refactored the class 'CardSet'