Fix expiry date and clean up credit card validation