Refactor Card Player