Added shuffling the deck after putting in power cards, and refactored returns to reduce redundancy