Refactoring payment events