Cleaned up Deck class