Refactored the deck and made some other changes