UNO: Cleaned up code in deck.java