Refactor for card