Refactored deck lists