Code duplication in Deck eliminated