major cleanup of get/cardholder code