Payments refactoring