Updated Shuffle method, still not working fully.

The Shuffle method, sometimes returns a card, sometimes returns one, and
sometimes none, need to fix this. Updated a little of my code to follow
coding standards.