Cleaned up the code a bit

The card table is currently commented out for debugging.