Refactor card drawing (untested)