Added shuffle function and cleaned up deck