Refactored adapater to remove CardData bean