CardMatchingGame refactoring