Refactor Deck