Clean up CardPresenter a bit.

Sorry for the import churn. I hate when people do that to me. What code styles are you using in AS? Default, something else?