Slight credit card refactoring