Fixing it so that the card pool doesn't deplete
Avoiding the use of 'exports' inside the core functions
Code alignment improvement
Fixing double-digit card counts to work in spinner