Refactored deck iteration and empty deck check logic

Refactored deck iteration and empty deck check logic #4