Payment refactoring