Better credit card scrubbing

See #253