Got rid of all that muck in the Card class