Added "shuffle" function to deck, cleaned up init