Moved around code in Card class