Updated Player class and cleaned up Deck class