[Mercy/Batman/Ernesto] - refactoring payment process
[Mercy/Ernesto] - Refactoring payment process