Refactoring
Fix payments