Refactored card payment logic
A bit more refactoring
Refactoring