Refactor: Card & PopulateDeck