Refactored card values