improved xml generator and credit card class