ICreditCard refactoring