Refactor card drawn checks