Moved shuffle into Deck initialization, changed instance method names for clarity