Some cleanup
Card size is global for everything