A bit of card_controller cleanup
Merge card_controller cleanups