Payment View refactoring